# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1593647577 18000
# Node ID 646e4b395cc8000f08cdee2ade516374109f341a
# Parent  f00f45a9512dd492eae2f8f0cc1d6d5a7a3c425c
Added pleroma backup cleanup and mediaproxy.

diff -r f00f45a9512d -r 646e4b395cc8 pleroma/aws-s3-backup/files/pleroma-s3-backup.sh
--- a/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh	Wed Jul 01 15:47:58 2020 -0500
+++ b/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh	Wed Jul 01 18:52:57 2020 -0500
@@ -24,3 +24,6 @@
 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 -r f00f45a9512d -r 646e4b395cc8 pleroma/otp/templates/config.exs.j2
--- a/pleroma/otp/templates/config.exs.j2	Wed Jul 01 15:47:58 2020 -0500
+++ b/pleroma/otp/templates/config.exs.j2	Wed Jul 01 18:52:57 2020 -0500
@@ -28,11 +28,10 @@
   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 @@
   database: "{{pleroma_db}}",
   hostname: "{{pleroma_db_host}}",
   pool_size: 10,
-  timeout: 60000,
-  pool_timeout: 60000
+  timeout: 60000