diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-28 12:31:12 +0400 | 
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-28 12:31:12 +0400 | 
| commit | 3b4be5daa2c24d674665d6bc490e5d8f0878dd6e (patch) | |
| tree | eca0c6d7754dd4c824f32cb262fe2d815400bcec /rel/files | |
| parent | 6e51845d44cd0cee89d9ad17faee4754435d582e (diff) | |
| parent | 25903a4996d12306d454be960a0a7478541b1879 (diff) | |
| download | pleroma-3b4be5daa2c24d674665d6bc490e5d8f0878dd6e.tar.gz pleroma-3b4be5daa2c24d674665d6bc490e5d8f0878dd6e.zip  | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-secure-mode
Diffstat (limited to 'rel/files')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 2 | ||||
| -rwxr-xr-x | rel/files/installation/init.d/pleroma | 1 | 
2 files changed, 2 insertions, 1 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 87c486514..6f0dba3a8 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -134,7 +134,7 @@ if [ -z "$1" ] || [ "$1" = "help" ]; then  "  else -	SCRIPT=$(readlink -f "$0") +	SCRIPT=$(realpath "$0")  	SCRIPTPATH=$(dirname "$SCRIPT")  	FULL_ARGS="$*" diff --git a/rel/files/installation/init.d/pleroma b/rel/files/installation/init.d/pleroma index dea1db26c..ca5b842e1 100755 --- a/rel/files/installation/init.d/pleroma +++ b/rel/files/installation/init.d/pleroma @@ -9,6 +9,7 @@ command=/opt/pleroma/bin/pleroma  command_args="start"  command_user=pleroma  command_background=1 +no_new_privs="yes"  # Ask process to terminate within 30 seconds, otherwise kill it  retry="SIGTERM/30/SIGKILL/5"  | 
