diff options
| author | Luke Hoersten <[email protected]> | 2020-07-01 18:52:57 -0500 |
|---|---|---|
| committer | Luke Hoersten <[email protected]> | 2020-07-01 18:52:57 -0500 |
| commit | f0a5a5264e3fb8c3726ba47a2509512b2d08d8b2 (patch) | |
| tree | a60181f33cca489341315caca848b7f0b276e2da | |
| parent | 45beaf5864bb374a6d0845b03a035dfddd7d2d83 (diff) | |
Added pleroma backup cleanup and mediaproxy.
| -rw-r--r-- | pleroma/aws-s3-backup/files/pleroma-s3-backup.sh | 3 | ||||
| -rw-r--r-- | pleroma/otp/templates/config.exs.j2 | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh b/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh index 7c1d6d3..22ba271 100644 --- a/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh +++ b/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh @@ -24,3 +24,6 @@ cp -r $STATIC_DIR "$BACKUP_DIR/" tar -zc -f $BACKUP_TAR $BACKUP_DIR aws s3 mb "s3://$BUCKET/" aws s3 cp $BACKUP_TAR "s3://$BUCKET/" + +rm $BACKUP_TAR +rm -r $BACKUP_DIR diff --git a/pleroma/otp/templates/config.exs.j2 b/pleroma/otp/templates/config.exs.j2 index d94be00..9a9db8c 100644 --- a/pleroma/otp/templates/config.exs.j2 +++ b/pleroma/otp/templates/config.exs.j2 @@ -28,11 +28,10 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "{{pleroma_data_dir}}/{{pleroma_instance}}/uploads/" config :pleroma, :media_proxy, - enabled: false, + enabled: true, redirect_on_failure: true #base_url: "https://cache.pleroma.social" -# Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, username: "{{pleroma_db_user}}", @@ -40,5 +39,4 @@ config :pleroma, Pleroma.Repo, database: "{{pleroma_db}}", hostname: "{{pleroma_db_host}}", pool_size: 10, - timeout: 60000, - pool_timeout: 60000 + timeout: 60000 |