hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source 
* origin/develop: (184 commits)
  html: lock down allowed class attributes to only those related to microformats
  Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
  Add :emoji settings to config.md
  added healthcheck setting to instance config
  Add shortcode_globs setting to documentation
  Add a changelog entry for `pleroma.in_reply_to_account_acct`
  Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
  Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
  Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs
  Use `User.get_cached*` everywhere
  Feature/826 healthcheck endpoint
  Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
  Formatting
  Change the default manifest to pleroma's namespace
  Replace MD5 with SHA256 for emoji pack verification
  Wrap the docstrings to 70 characters
  differences_in_mastoapi_responses.md: `content_type` parameter of post submission
  [#923] Refactored OAuthController#authorize definitions, added test.
  Set correct values in the MastoAPI reblog status view
  Mention Mastodon 2.8+ follow import fix in changelog
  ...
This commit is contained in:
Henry Jameson 2019-04-24 02:38:41 +03:00
commit 5015d517d0
738 changed files with 6534 additions and 66437 deletions
Download patch file Download diff file Expand all files Collapse all files

2
installation/pleroma.nginx
View file

@ -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;

21
installation/pleroma.supervisord Normal file
View file

@ -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