From 851f750948120c5ae1b22e7bc9adc9ec2e9aa526 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 25 May 2020 17:25:58 +0100 Subject: [PATCH] Move duplicati to its own role so it can be installed on `grimes` --- ansible/main.yml | 1 + .../duplicati => duplicati/files}/docker-compose.yml | 7 ++----- .../tasks/duplicati.yml => duplicati/tasks/main.yml} | 2 +- ansible/roles/intersect-docker/tasks/main.yml | 3 --- ansible/roles/intersect-docker/vars/pihole.yml | 1 - terraform/jakehoward.tech.tf | 8 -------- 6 files changed, 4 insertions(+), 18 deletions(-) rename ansible/roles/{intersect-docker/files/duplicati => duplicati/files}/docker-compose.yml (58%) rename ansible/roles/{intersect-docker/tasks/duplicati.yml => duplicati/tasks/main.yml} (94%) diff --git a/ansible/main.yml b/ansible/main.yml index b227973..ae96ae5 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -25,6 +25,7 @@ - watchtower - netdata - traefik + - duplicati - hosts: intersect roles: diff --git a/ansible/roles/intersect-docker/files/duplicati/docker-compose.yml b/ansible/roles/duplicati/files/docker-compose.yml similarity index 58% rename from ansible/roles/intersect-docker/files/duplicati/docker-compose.yml rename to ansible/roles/duplicati/files/docker-compose.yml index 5701e32..4e8cd88 100644 --- a/ansible/roles/intersect-docker/files/duplicati/docker-compose.yml +++ b/ansible/roles/duplicati/files/docker-compose.yml @@ -12,8 +12,5 @@ services: - ./restore:/restore - /:/source:ro restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.duplicati.rule=Host(`duplicati.jakehoward.tech`)" - - "traefik.http.routers.duplicati.tls.certresolver=le" - - "traefik.http.routers.duplicati.middlewares=internal-only@file" + ports: + - 8200:8200 diff --git a/ansible/roles/intersect-docker/tasks/duplicati.yml b/ansible/roles/duplicati/tasks/main.yml similarity index 94% rename from ansible/roles/intersect-docker/tasks/duplicati.yml rename to ansible/roles/duplicati/tasks/main.yml index 92dd43e..841334c 100644 --- a/ansible/roles/intersect-docker/tasks/duplicati.yml +++ b/ansible/roles/duplicati/tasks/main.yml @@ -8,7 +8,7 @@ - name: Install duplicati compose file template: - src: files/duplicati/docker-compose.yml + src: files/docker-compose.yml dest: /opt/duplicati/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" diff --git a/ansible/roles/intersect-docker/tasks/main.yml b/ansible/roles/intersect-docker/tasks/main.yml index 23f215c..6c7c66c 100644 --- a/ansible/roles/intersect-docker/tasks/main.yml +++ b/ansible/roles/intersect-docker/tasks/main.yml @@ -1,9 +1,6 @@ - name: Install calibre include: calibre.yml -- name: Install duplicati - include: duplicati.yml - - name: Install emby include: emby.yml diff --git a/ansible/roles/intersect-docker/vars/pihole.yml b/ansible/roles/intersect-docker/vars/pihole.yml index 592adf1..1a7e3e9 100644 --- a/ansible/roles/intersect-docker/vars/pihole.yml +++ b/ansible/roles/intersect-docker/vars/pihole.yml @@ -1,5 +1,4 @@ internal_hostnames: - - duplicati.jakehoward.tech - deluge.jakehoward.tech - speed.jakehoward.tech - pihole.jakehoward.tech diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf index 7058912..f259eae 100644 --- a/terraform/jakehoward.tech.tf +++ b/terraform/jakehoward.tech.tf @@ -140,14 +140,6 @@ resource "cloudflare_record" "jakehowardtech_fah" { ttl = 1 } -resource "cloudflare_record" "jakehowardtech_duplicati" { - zone_id = cloudflare_zone.jakehowardtech.id - name = "duplicati" - value = vultr_server.casey.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "jakehowardtech_deluge" { zone_id = cloudflare_zone.jakehowardtech.id name = "deluge"