From d3fcd65dac2f9a4580fda0dfdb305e801f851a0e Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 8 Feb 2023 13:37:57 +0100 Subject: [PATCH] Handle pid directory through systemd --- conf/systemd.service | 1 + scripts/install | 9 --------- scripts/remove | 7 ------- scripts/restore | 9 --------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index d579d7d..b2fc349 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,7 @@ After=network.target Type=simple User=__APP__ Group=__APP__ +RuntimeDirectory=__APP__ Environment="ES_JAVA_HOME=__FINALPATH__/jdk" Environment="ES_PATH_CONF=__FINALPATH__/config" Environment="PID_DIR=/run/__APP__" diff --git a/scripts/install b/scripts/install index be490c4..1e9f7d5 100755 --- a/scripts/install +++ b/scripts/install @@ -87,15 +87,6 @@ chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# CREATE PID DIRECTORY -#================================================= - -mkdir -p "/run/$app" - -chmod 700 "/run/$app" -chown $app:$app "/run/$app" - #================================================= # ADD CONFIGURATIONS #================================================= diff --git a/scripts/remove b/scripts/remove index 18b9aeb..1f06e84 100755 --- a/scripts/remove +++ b/scripts/remove @@ -68,13 +68,6 @@ then ynh_secure_remove --file="$datadir" fi -#================================================= -# REMOVE PID DIR -#================================================= - -ynh_script_progression --message="Removing pid directory..." --weight=1 -ynh_secure_remove --file="/run/$app" - #================================================= # CLOSE A PORT #================================================= diff --git a/scripts/restore b/scripts/restore index 28e18d5..6183965 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,15 +74,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# CREATE PID DIRECTORY -#================================================= - -mkdir -p "/run/$app" - -chmod 700 "/run/$app" -chown $app:$app "/run/$app" - #================================================= # SPECIFIC RESTORATION #=================================================