summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-08-05 13:08:31 -0500
committerAlex Gleason <alex@alexgleason.me>2020-08-05 13:08:31 -0500
commitcc196e2cd57966889021342405ebc8fd0763e83a (patch)
tree232051460624a0fd0720ed04cc5512208ce1989b /installation/init.d
parentad9c925efb77287316f5dbac26f6a1b16662910a (diff)
parent7755f49e281e4990db5317b33d6b8e0d12982e0c (diff)
downloadpleroma-cc196e2cd57966889021342405ebc8fd0763e83a.tar.gz
pleroma-cc196e2cd57966889021342405ebc8fd0763e83a.zip
Merge remote-tracking branch 'upstream/develop' into restrict-domain
Diffstat (limited to 'installation/init.d')
-rwxr-xr-xinstallation/init.d/pleroma1
1 files changed, 1 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}