diff options
| -rw-r--r-- | pleroma/aws-s3-backup/files/pleroma-s3-backup.sh (renamed from pleroma-otp/files/pleroma-s3-backup.sh) | 0 | ||||
| -rw-r--r-- | pleroma/aws-s3-backup/files/[email protected] (renamed from pleroma-otp/files/[email protected]) | 0 | ||||
| -rw-r--r-- | pleroma/aws-s3-backup/meta/main.yaml | 4 | ||||
| -rw-r--r-- | pleroma/aws-s3-backup/tasks/main.yaml (renamed from pleroma-otp/tasks/s3-backup.yaml) | 0 | ||||
| -rw-r--r-- | pleroma/otp/defaults/main.yaml (renamed from pleroma-otp/defaults/main.yaml) | 1 | ||||
| -rw-r--r-- | pleroma/otp/files/[email protected] (renamed from pleroma-otp/files/[email protected]) | 0 | ||||
| -rw-r--r-- | pleroma/otp/handlers/main.yaml (renamed from pleroma-otp/handlers/main.yaml) | 0 | ||||
| -rw-r--r-- | pleroma/otp/tasks/main.yaml (renamed from pleroma-otp/tasks/main.yaml) | 3 | ||||
| -rw-r--r-- | pleroma/otp/templates/config.exs.j2 (renamed from pleroma-otp/templates/config.exs.j2) | 0 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 (renamed from pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2) | 0 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 (renamed from pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2) | 0 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 (renamed from pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2) | 0 | ||||
| -rw-r--r-- | pleroma/otp/templates/setup_db.psql.j2 (renamed from pleroma-otp/templates/setup_db.psql.j2) | 0 |
13 files changed, 4 insertions, 4 deletions
diff --git a/pleroma-otp/files/pleroma-s3-backup.sh b/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh index 7c1d6d3..7c1d6d3 100644 --- a/pleroma-otp/files/pleroma-s3-backup.sh +++ b/pleroma/aws-s3-backup/files/pleroma-s3-backup.sh diff --git a/pleroma-otp/files/[email protected] b/pleroma/aws-s3-backup/files/[email protected] index a64cae3..a64cae3 100644 --- a/pleroma-otp/files/[email protected] +++ b/pleroma/aws-s3-backup/files/[email protected] diff --git a/pleroma/aws-s3-backup/meta/main.yaml b/pleroma/aws-s3-backup/meta/main.yaml new file mode 100644 index 0000000..f9c6f63 --- /dev/null +++ b/pleroma/aws-s3-backup/meta/main.yaml @@ -0,0 +1,4 @@ +--- + +dependencies: + - aws-s3-backup diff --git a/pleroma-otp/tasks/s3-backup.yaml b/pleroma/aws-s3-backup/tasks/main.yaml index 12eaded..12eaded 100644 --- a/pleroma-otp/tasks/s3-backup.yaml +++ b/pleroma/aws-s3-backup/tasks/main.yaml diff --git a/pleroma-otp/defaults/main.yaml b/pleroma/otp/defaults/main.yaml index 1726861..464c829 100644 --- a/pleroma-otp/defaults/main.yaml +++ b/pleroma/otp/defaults/main.yaml @@ -24,5 +24,4 @@ pleroma_db: "pleroma_{{pleroma_instance}}" pleroma_db_user: "pleroma_{{pleroma_instance}}" pleroma_data_dir: "/var/lib/pleroma/instance_data" -pleroma_s3_backup_enabled: true pleroma_cleanup_tmp: false diff --git a/pleroma-otp/files/[email protected] b/pleroma/otp/files/[email protected] index 4967c63..4967c63 100644 --- a/pleroma-otp/files/[email protected] +++ b/pleroma/otp/files/[email protected] diff --git a/pleroma-otp/handlers/main.yaml b/pleroma/otp/handlers/main.yaml index 0fad634..0fad634 100644 --- a/pleroma-otp/handlers/main.yaml +++ b/pleroma/otp/handlers/main.yaml diff --git a/pleroma-otp/tasks/main.yaml b/pleroma/otp/tasks/main.yaml index 8a1e032..c031666 100644 --- a/pleroma-otp/tasks/main.yaml +++ b/pleroma/otp/tasks/main.yaml @@ -86,9 +86,6 @@ - "/tmp/release/" when: pleroma_cleanup_tmp -- import_tasks: s3-backup.yaml - when: pleroma_s3_backup_enabled - - name: configure pleroma systemd service become: yes copy: diff --git a/pleroma-otp/templates/config.exs.j2 b/pleroma/otp/templates/config.exs.j2 index d94be00..d94be00 100644 --- a/pleroma-otp/templates/config.exs.j2 +++ b/pleroma/otp/templates/config.exs.j2 diff --git a/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 index 20ccc78..20ccc78 100644 --- a/pleroma-otp/templates/pleroma.cloudflare.index.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 diff --git a/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 index e64b00c..e64b00c 100644 --- a/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 diff --git a/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 index 5a43748..5a43748 100644 --- a/pleroma-otp/templates/pleroma.letsencrypt.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 diff --git a/pleroma-otp/templates/setup_db.psql.j2 b/pleroma/otp/templates/setup_db.psql.j2 index 1b27174..1b27174 100644 --- a/pleroma-otp/templates/setup_db.psql.j2 +++ b/pleroma/otp/templates/setup_db.psql.j2 |