diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
| commit | 76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (patch) | |
| tree | ffc5e72a54b1fe1289038e934fb20eb6c1431b4f /installation | |
| parent | 2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e (diff) | |
| parent | 0495a07dc77d81abf46cbe166ae3fec14f705809 (diff) | |
| download | pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.tar.gz pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.zip | |
Merge branch 'develop' into mutes-blocks-pagination
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/init.d/pleroma | 1 | ||||
| -rw-r--r-- | installation/pleroma.service | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma index 384536f7e..e908cda1b 100755 --- a/installation/init.d/pleroma +++ b/installation/init.d/pleroma @@ -8,6 +8,7 @@ pidfile="/var/run/pleroma.pid" directory=/opt/pleroma healthcheck_delay=60 healthcheck_timer=30 +export $(cat /opt/pleroma/config/pleroma.env) : ${pleroma_port:-4000} diff --git a/installation/pleroma.service b/installation/pleroma.service index 5dcbc1387..ee00a3b7a 100644 --- a/installation/pleroma.service +++ b/installation/pleroma.service @@ -17,6 +17,8 @@ Environment="MIX_ENV=prod" Environment="HOME=/var/lib/pleroma" ; Path to the folder containing the Pleroma installation. WorkingDirectory=/opt/pleroma +; Path to the environment file. the file contains RELEASE_COOKIE and etc +EnvironmentFile=/opt/pleroma/config/pleroma.env ; Path to the Mix binary. ExecStart=/usr/bin/mix phx.server |