diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
commit | 3c4cab9be18ff543d025177b418ddd0b16050e68 (patch) | |
tree | 3b4d32c978ecfaa656256509bf390d6ca22c6679 /installation | |
parent | 9a98f48ec3f438e543a5a621624401bb22a0d44a (diff) | |
parent | 41d78f91083b5017e6085150bfae71a842f5c47f (diff) | |
download | pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.tar.gz pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.zip |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'installation')
-rw-r--r-- | installation/pleroma.nginx | 2 | ||||
-rw-r--r-- | installation/pleroma.supervisord | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 8709f2cb7..cc75d78b2 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -37,7 +37,7 @@ server { listen [::]:443 ssl http2; ssl_session_timeout 5m; - ssl_trusted_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; + ssl_trusted_certificate /etc/letsencrypt/live/example.tld/chain.pem; ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem; diff --git a/installation/pleroma.supervisord b/installation/pleroma.supervisord new file mode 100644 index 000000000..19efffd6e --- /dev/null +++ b/installation/pleroma.supervisord @@ -0,0 +1,21 @@ +; Assumes pleroma is installed in /home/pleroma/pleroma and running as the pleroma user +; Also assumes mix is in /usr/bin, this might differ on BSDs or niche Linux distros +; Logs into /home/pleroma/logs +[program:pleroma] +command=/usr/bin/mix phx.server +directory=/home/pleroma/pleroma +autostart=true +autorestart=true +user=pleroma +environment = + MIX_ENV=prod, + HOME=/home/pleroma, + USER=pleroma, + PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/home/pleroma/bin:%(ENV_PATH)s", + PWD=/home/pleroma/pleroma +stdout_logfile=/home/pleroma/logs/stdout.log +stdout_logfile_maxbytes=50MB +stdout_logfile_backups=10 +stderr_logfile=/home/pleroma/logs/stderr.log +stderr_logfile_maxbytes=50MB +stderr_logfile_backups=10
\ No newline at end of file |