diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-11-09 09:14:41 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-11-09 09:14:41 +0000 |
| commit | db07b538a511b315a3638f3d0b1abfb4877d10c9 (patch) | |
| tree | 1bdb071352bc83dc2a5a537f04ba37da9bf6dcf1 /installation | |
| parent | 294628d9815d6e7390427c08ff0f8f5b073dc10f (diff) | |
| parent | cc45c69fff515cb82c4902b67c8edce6b109c819 (diff) | |
| download | pleroma-db07b538a511b315a3638f3d0b1abfb4877d10c9.tar.gz | |
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/init.d/pleroma | 1 | ||||
| -rw-r--r-- | installation/pleroma.service | 2 |
2 files changed, 0 insertions, 3 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} diff --git a/installation/pleroma.service b/installation/pleroma.service index 63e83ed6e..8338228d8 100644 --- a/installation/pleroma.service +++ b/installation/pleroma.service @@ -17,8 +17,6 @@ Environment="MIX_ENV=prod" Environment="HOME=/var/lib/pleroma" ; Path to the folder containing the Pleroma installation. WorkingDirectory=/opt/pleroma -; Path to the environment file. the file contains RELEASE_COOKIE and etc -EnvironmentFile=/opt/pleroma/config/pleroma.env ; Path to the Mix binary. ExecStart=/usr/bin/mix phx.server |