Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (67 commits) Fix example json response ChatMessage schema: Add preview cards. ChatMessageReferenceView: Display preview cards. OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. Attempt to fix markdown formatting Apply 1 suggestion(s) to 1 file(s) set versions updated `cors_plug` set `postgrex` version set `web_push_encryption` version updated `calendar` package Expose seconds_valid in Pleroma Captcha API endpoint :show_reactions, refactor the other test :show_reactions, add CHANGELOG.md, refactor test feed/user_controller: Return 404 when the user is remote AccountController: Don't explicitly ask to keep users unconfirmed. EnsureRePrepended: Don't break on chat messages. update mogrify package set http_signatures version set `jason` version ...
This commit is contained in:
commit
605d542a7c
66 changed files with 1357 additions and 282 deletions
|
|
@ -8,6 +8,7 @@ pidfile="/var/run/pleroma.pid"
|
|||
directory=/opt/pleroma
|
||||
healthcheck_delay=60
|
||||
healthcheck_timer=30
|
||||
export $(cat /opt/pleroma/config/pleroma.env)
|
||||
|
||||
: ${pleroma_port:-4000}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ Environment="MIX_ENV=prod"
|
|||
Environment="HOME=/home/pleroma"
|
||||
; Path to the folder containing the Pleroma installation.
|
||||
WorkingDirectory=/home/pleroma/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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue