summaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-10-17 17:53:47 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-10-17 17:53:47 +0300
commit9ea31b373fdb75bb6aa04d006e5f493158897efa (patch)
treeb7301d21a9bc675984bb11b40c96148c0205270e /installation
parenta859d9bc15cd1e4ff15bb63d6c114f71783118ef (diff)
parent023f726d7f497705d766adee8874b94efb08a0aa (diff)
downloadpleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.tar.gz
pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.zip
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Diffstat (limited to 'installation')
-rwxr-xr-xinstallation/init.d/pleroma1
-rw-r--r--installation/pleroma.service2
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