summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-11 10:55:10 +0200
committerlain <lain@soykaf.club>2020-08-11 10:55:10 +0200
commit677abbf0ee8d44f88e40f21526c401eb4ed8cc05 (patch)
tree7669034cb73935b8f9fde9df419d33cd56117346 /installation/init.d
parent7e4932362b7e672b08543cfd189deb3776268fe3 (diff)
parent024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4 (diff)
downloadpleroma-677abbf0ee8d44f88e40f21526c401eb4ed8cc05.tar.gz
pleroma-677abbf0ee8d44f88e40f21526c401eb4ed8cc05.zip
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
Diffstat (limited to 'installation/init.d')
-rwxr-xr-xinstallation/init.d/pleroma1
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}