diff options
| author | feld <feld@feld.me> | 2020-10-15 20:21:57 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-15 20:21:57 +0000 |
| commit | 5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (patch) | |
| tree | a9167edcdd5c956490fa0886901427c5423540c6 /installation | |
| parent | b48724afcdd9d46d6533aafdea4df1cc2d23b6ae (diff) | |
| parent | 2030ffd4904b6ab5e99cefa62887154a49aaf4db (diff) | |
| download | pleroma-5703fb6d2a5f9fcffe050eadbc43758bcd2efa14.tar.gz pleroma-5703fb6d2a5f9fcffe050eadbc43758bcd2efa14.zip | |
Merge branch 'issue/2009' into 'develop'
[#2009] fixed install docs (release env)
See merge request pleroma/pleroma!2854
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 |