Update service files of OpenRC and systemd to new recommended paths

diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma
index 2b211df65ff59cebc2167a53c4950495a89191fa..ed50bb551a0b9591a7ea15503083859b2bfa77ca 100755 (executable)
--- a/installation/init.d/pleroma
+++ b/installation/init.d/pleroma
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 # Requires OpenRC >= 0.35
-directory=~pleroma/pleroma
+directory=/opt/pleroma
 
 command=/usr/bin/mix
 command_args="phx.server"
@@ -18,4 +18,4 @@ pidfile="/var/run/pleroma.pid"
 
 depend() {
     need nginx postgresql
-}
\ No newline at end of file
+}

diff --git a/installation/pleroma.service b/installation/pleroma.service
index 72090bbc74cec8a0c5608980838cd3d7048805bb..5dcbc13877f916de16443bec9ead491ee26bb687 100644 (file)
--- a/installation/pleroma.service
+++ b/installation/pleroma.service
@@ -14,15 +14,17 @@ Environment="MIX_ENV=prod"
 
 ; Make sure that all paths fit your installation.
 ; Path to the home directory of the user running the Pleroma service.
-Environment="HOME=/home/pleroma"
+Environment="HOME=/var/lib/pleroma"
 ; Path to the folder containing the Pleroma installation.
-WorkingDirectory=/home/pleroma/pleroma
+WorkingDirectory=/opt/pleroma
 ; Path to the Mix binary.
 ExecStart=/usr/bin/mix phx.server
 
 ; Some security directives.
 ; Use private /tmp and /var/tmp folders inside a new file system namespace, which are discarded after the process stops.
 PrivateTmp=true
+; The /home, /root, and /run/user folders can not be accessed by this service anymore. If your Pleroma user has its home folder in one of the restricted places, or use one of these folders as its working directory, you have to set this to false.
+ProtectHome=true
 ; Mount /usr, /boot, and /etc as read-only for processes invoked by this service.
 ProtectSystem=full
 ; Sets up a new /dev mount for the process and only adds API pseudo devices like /dev/null, /dev/zero or /dev/random but not physical devices. Disabled by default because it may not work on devices like the Raspberry Pi.