diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-10 19:25:34 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-10 19:25:34 +0000 |
| commit | 49b5f8d7c903231be64a1ee75445f37700b024b5 (patch) | |
| tree | ee2eb3af8eebf86986947243356eed341766247b | |
| parent | 57501defb40955b1edc2552ecf422b48c573aaee (diff) | |
| parent | d1752a81a8f0de5401e9fcfbee0c1242c7768d6d (diff) | |
| download | pleroma-49b5f8d7c903231be64a1ee75445f37700b024b5.tar.gz | |
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
Update service files of OpenRC and systemd to new recommended paths
See merge request pleroma/pleroma!798
| -rwxr-xr-x | installation/init.d/pleroma | 4 | ||||
| -rw-r--r-- | installation/pleroma.service | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma index 2b211df65..ed50bb551 100755 --- 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 72090bbc7..5dcbc1387 100644 --- 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. |