From 88eb4f6595fa35c1fab3b77decf243588cf162bd Mon Sep 17 00:00:00 2001
From: Andreas Linz <klingt.net@gmail.com>
Date: Sun, 27 Oct 2019 13:36:22 +0100
Subject: [PATCH] Remove incompatible restic plugin

Because of this issue: https://github.com/caddyserver/caddy/issues/2560
---
 backup.sh                            |  1 -
 build/caddy/plugins.patch            |  1 -
 playbook.yml                         |  1 -
 roles/caddy/defaults/main.yml        |  1 -
 roles/caddy/tasks/main.yml           | 10 +---------
 roles/caddy/templates/Caddyfile.tmpl | 16 ----------------
 6 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/backup.sh b/backup.sh
index 9647d5a..bcd4f23 100755
--- a/backup.sh
+++ b/backup.sh
@@ -19,7 +19,6 @@ _caddy() {
     ssh ${domain} "sudo systemctl stop caddy"
     local fname="backups/caddy-files-${timestamp}.tar.xz"
     echo "Creating $fname ..."
-    # backup 'restic files.${domain}' in a separate target
     ssh ${domain} "sudo tar -C /home/caddy -cf - -- certs | pixz" > "$fname"
     ssh ${domain} "sudo systemctl start caddy"
 }
diff --git a/build/caddy/plugins.patch b/build/caddy/plugins.patch
index 263c5c3..558c418 100644
--- a/build/caddy/plugins.patch
+++ b/build/caddy/plugins.patch
@@ -19,7 +19,6 @@ index e9ce689b..56a4b096 100644
 +	_ "github.com/miekg/caddy-prometheus"
 +	_ "github.com/nicolasazrak/caddy-cache"
 +	_ "github.com/pyed/ipfilter"
-+	_ "github.com/restic/caddy"
 +	_ "github.com/xuqingfeng/caddy-rate-limit"
  )
  
diff --git a/playbook.yml b/playbook.yml
index c9d2dac..c438a47 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -8,7 +8,6 @@
     domain: "{{ var_domain | default('klingt.net') }}"
     domain_version: unknown
     caddy_email: "{{ user_email }}"
-    caddy_restic_user: alinz
     web_root: /var/web
   vars_files:
     - vault_vars.yml
diff --git a/roles/caddy/defaults/main.yml b/roles/caddy/defaults/main.yml
index 6e09d97..070d9c2 100644
--- a/roles/caddy/defaults/main.yml
+++ b/roles/caddy/defaults/main.yml
@@ -2,5 +2,4 @@ caddy_user: caddy
 caddy_group: caddy
 caddy_path: /usr/bin/caddy
 caddy_prometheus_port: 9180
-caddy_restic_path: "/home/{{ caddy_user }}/restic"
 caddy_file_browser_root: "/home/{{ caddy_user }}/files.{{ domain }}"
diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml
index a09e81d..0e01160 100644
--- a/roles/caddy/tasks/main.yml
+++ b/roles/caddy/tasks/main.yml
@@ -39,14 +39,6 @@
     - "{{ domain }}.key"
     - "{{ domain }}.crt"
   when: is_staging
-- name: Create caddy restic path
-  become: true
-  file:
-    name: "{{ caddy_restic_path }}"
-    owner: "{{ caddy_user }}"
-    group: "{{ caddy_group }}"
-    state: directory
-    mode: 0700
 - name: "Create {{ caddy_file_browser_root }} directory"
   become: true
   file:
@@ -98,4 +90,4 @@
     name: caddy
     state: started
     enabled: true
-  notify: restart-caddy
\ No newline at end of file
+  notify: restart-caddy
diff --git a/roles/caddy/templates/Caddyfile.tmpl b/roles/caddy/templates/Caddyfile.tmpl
index a025253..f0fb87f 100644
--- a/roles/caddy/templates/Caddyfile.tmpl
+++ b/roles/caddy/templates/Caddyfile.tmpl
@@ -86,22 +86,6 @@ grafana.{{ domain }}:443 {
     }
 }
 
-restic.{{ domain }}:80 {
-    prometheus
-    header / X-klingt-net-version "{{ domain_version }}"
-    errors stderr
-    redir https://restic.{{ domain }}{uri}
-}
-restic.{{ domain }}:443 {
-    prometheus
-    header / X-klingt-net-version "{{ domain_version }}"
-    errors stderr
-    {% if is_staging %}tls /home/{{ caddy_user }}/certs/{{ domain }}.crt /home/{{ caddy_user }}/certs/{{ domain }}.key
-{% endif %}
-    basicauth / {{ caddy_restic_user }} {{ caddy_restic_password }}
-    restic / {{ caddy_restic_path }}
-}
-
 files.{{ domain }}:80 {
     import common.caddy
     redir https://files.{{ domain }}{uri}