diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 19:16:48 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 19:16:48 +0300 |
commit | 4672b61106044c3772f58b02d39531b015ad8cca (patch) | |
tree | 0c0844bab5eae07265965b2b6dbd914afc55f9d6 /installation/init.d | |
parent | 3116a75e80144dff79232c8676bd28ed285a14d9 (diff) | |
parent | 7755f49e281e4990db5317b33d6b8e0d12982e0c (diff) | |
download | pleroma-4672b61106044c3772f58b02d39531b015ad8cca.tar.gz pleroma-4672b61106044c3772f58b02d39531b015ad8cca.zip |
Merge branch 'develop' into command-available-check
Diffstat (limited to 'installation/init.d')
-rwxr-xr-x | installation/init.d/pleroma | 1 |
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} |