diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
commit | 1a5a7ba6e8a936d3138ca530d3466111e542aef6 (patch) | |
tree | c056138ee21661af45d2363ce01282aafffb3fc0 /installation/init.d | |
parent | bd1e2e3a58ebd702306e7a6e2df985ac07e5f7d8 (diff) | |
parent | 47698fc322da58894dd41c1bfd5ca0376200dc5e (diff) | |
download | pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.tar.gz pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.zip |
Merge remote-tracking branch 'upstream/develop' into aliases
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} |