diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-20 17:27:29 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-20 17:27:29 +0400 |
commit | e87901c424015b79e2412310f41e74f3f0e71544 (patch) | |
tree | b2214aa2a81311a21ec871a1f16881db6a52025b /installation/init.d | |
parent | ad605e3e16ba3f6ee3df7a0a3e6705036fef369f (diff) | |
parent | 44b2a137d12a4ded75586f919ad1c927c6677a70 (diff) | |
download | pleroma-e87901c424015b79e2412310f41e74f3f0e71544.tar.gz pleroma-e87901c424015b79e2412310f41e74f3f0e71544.zip |
Merge remote-tracking branch 'origin/develop' into feature/account-export
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} |