Fix: Use correct PID path in service file

Merge pull request #50 from doracpphp/fix-gsad_pid_dir
greenbone · Mar 3, 2022 · fbaa816 · fbaa816
2 parents 39ee4a6 + 3ad0bd4
commit fbaa816
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,9 +97,6 @@ if (NOT GVMD_RUN_DIR)
   set (GVMD_RUN_DIR  "/run/gvmd")
 endif (NOT GVMD_RUN_DIR)
 
-if (NOT GSAD_PID_DIR)
-  set (GSAD_PID_DIR "${GVM_RUN_DIR}")
-endif (NOT GSAD_PID_DIR)
 
 
 if (NOT GVM_STATE_DIR)

diff --git a/config/gsad.service.in b/config/gsad.service.in
@@ -8,7 +8,7 @@ Wants=gvmd.service
 Type=forking
 User=gvm
 Group=gvm
-PIDFile=${GSAD_PID_DIR}/gsad.pid
+PIDFile=${GSAD_PID_PATH}
 ExecStart=${SBINDIR}/gsad --listen 127.0.0.1 --port 9392 --http-only
 Restart=always
 TimeoutStopSec=10

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -141,9 +141,6 @@ if (GSAD_DATA_DIR)
   add_definitions (-DGSAD_DATA_DIR="${GSAD_DATA_DIR}")
 endif (GSAD_DATA_DIR)
 
-if (GSAD_PID_DIR)
-  add_definitions (-DGSAD_PID_DIR="${GSAD_PID_DIR}")
-endif (GSAD_PID_DIR)
 
 if (GSAD_CONFIG_DIR)
   add_definitions (-DGSAD_CONFIG_DIR="${GSAD_CONFIG_DIR}")