diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
commit | 489b12cde48d0ed6b16914c5a831b1e992d0d059 (patch) | |
tree | 2928b5b9111339f16a5642c4ec07c82851c4f7ed /installation/init.d | |
parent | ccc2cf0e87f47618163da588ead76846c64cba7a (diff) | |
parent | ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff) | |
download | pleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.tar.gz pleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.zip |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Diffstat (limited to 'installation/init.d')
-rwxr-xr-x | installation/init.d/pleroma | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma index e908cda1b..384536f7e 100755 --- a/installation/init.d/pleroma +++ b/installation/init.d/pleroma @@ -8,7 +8,6 @@ pidfile="/var/run/pleroma.pid" directory=/opt/pleroma healthcheck_delay=60 healthcheck_timer=30 -export $(cat /opt/pleroma/config/pleroma.env) : ${pleroma_port:-4000} |