From f0a5a5264e3fb8c3726ba47a2509512b2d08d8b2 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Wed, 1 Jul 2020 18:52:57 -0500
Subject: Added pleroma backup cleanup and mediaproxy.

---
 pleroma/aws-s3-backup/files/pleroma-s3-backup.sh | 3 +++
 pleroma/otp/templates/config.exs.j2              | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'pleroma')

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
-- 
cgit v1.2.3