From 2d8c670110de187e1a58ca13bc71ae09f9f8b63e Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sun, 25 Jun 2023 19:19:38 +0200
Subject: [PATCH] Fix minor issues

---
 _ansible/roles/watchtower/tasks/main.yml      | 6 +-----
 _ansible/tasks/steps/template-site-config.yml | 1 +
 caddy/Dockerfile                              | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/_ansible/roles/watchtower/tasks/main.yml b/_ansible/roles/watchtower/tasks/main.yml
index 21ba062..a186da3 100644
--- a/_ansible/roles/watchtower/tasks/main.yml
+++ b/_ansible/roles/watchtower/tasks/main.yml
@@ -4,14 +4,10 @@
     - watchtower
     - container
   block:
-    - import_tasks: steps/create-service-directory.yml
-    - import_tasks: steps/template-docker-compose.yml
-    - import_tasks: steps/template-service-env.yml
+    - import_tasks: deploy-common-service.yml
     
     - name: Copy the run-once script
       ansible.builtin.copy:
         src: run-once.sh
         dest: "{{ (service_path, 'run-once.sh') | path_join }}"
         mode: '0755'
-
-    - import_tasks: steps/start-service.yml
diff --git a/_ansible/tasks/steps/template-site-config.yml b/_ansible/tasks/steps/template-site-config.yml
index 90ebb35..ac84674 100644
--- a/_ansible/tasks/steps/template-site-config.yml
+++ b/_ansible/tasks/steps/template-site-config.yml
@@ -3,3 +3,4 @@
     src: caddy_site.conf.j2
     dest: "{{ (caddy_config_path, svc.domain + '.conf') | path_join }}"
     mode: "0644"
+  when: svc.domain is defined
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 363dc11..f383d18 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,7 +1,7 @@
 FROM caddy:2-builder AS builder
 
 RUN xcaddy build \
-    --with github.com/caddy-dns/acmedns
+    --with github.com/caddy-dns/acmedns@main
 
 FROM caddy:2-alpine