move acmetool to new x509 subdir

28 files changed, 19 insertions, 19 deletions

diff --git a/chaos-at-home/ch-http-proxy.yml b/chaos-at-home/ch-http-proxy.yml
index dc362aa4..77715049 100644
--- a/chaos-at-home/ch-http-proxy.yml
+++ b/chaos-at-home/ch-http-proxy.yml
@@ -7,7 +7,7 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: apt-repo/spreadspace
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   post_tasks:
   #### web.chaos-at-home.org (default-server)
diff --git a/chaos-at-home/ch-imap-proxy.yml b/chaos-at-home/ch-imap-proxy.yml
index fa23e9bb..d402c096 100644
--- a/chaos-at-home/ch-imap-proxy.yml
+++ b/chaos-at-home/ch-imap-proxy.yml
@@ -7,8 +7,8 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: apt-repo/spreadspace
-  - role: acmetool/base
-  - role: acmetool/cert
+  - role: x509/acmetool/base
+  - role: x509/acmetool/cert
     acmetool_cert_name: "imap.chaos-at-home.org"
     acmetool_cert_config:
       request:
diff --git a/chaos-at-home/ch-mimas.yml b/chaos-at-home/ch-mimas.yml
index f5219bc3..2743644c 100644
--- a/chaos-at-home/ch-mimas.yml
+++ b/chaos-at-home/ch-mimas.yml
@@ -22,7 +22,7 @@
   - role: network/wireguard/base
   - role: network/wireguard/p2p
   - role: network/bind
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
diff --git a/chaos-at-home/ch-pan.yml b/chaos-at-home/ch-pan.yml
index 6edd32fc..56a4f30a 100644
--- a/chaos-at-home/ch-pan.yml
+++ b/chaos-at-home/ch-pan.yml
@@ -15,7 +15,7 @@
   - role: network/wireguard/p2p
   - role: network/bind
   - role: dyndns/server
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: apt-repo/spreadspace
   - role: monitoring/prometheus/exporter
diff --git a/dan/ele-coturn.yml b/dan/ele-coturn.yml
index 9438c7b5..4111f156 100644
--- a/dan/ele-coturn.yml
+++ b/dan/ele-coturn.yml
@@ -14,6 +14,6 @@
   - role: apt-repo/spreadspace
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: apps/coturn
   - role: apps/mumble
diff --git a/dan/ele-jitsi.yml b/dan/ele-jitsi.yml
index 1ac3ef3f..68d14576 100644
--- a/dan/ele-jitsi.yml
+++ b/dan/ele-jitsi.yml
@@ -14,6 +14,6 @@
   - role: apt-repo/spreadspace
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: apps/jitsi/meet
diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml
index 097ee5d1..67eaafcd 100644
--- a/dan/ele-lt.yml
+++ b/dan/ele-lt.yml
@@ -12,6 +12,6 @@
   hosts: ele-lt
   roles:
   - role: apt-repo/spreadspace
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: elevate/liquidtruth
diff --git a/dan/ele-media.yml b/dan/ele-media.yml
index c3913273..1c0b186d 100644
--- a/dan/ele-media.yml
+++ b/dan/ele-media.yml
@@ -19,6 +19,6 @@
   - role: kubernetes/standalone/base
   - role: network/wireguard/base
   - role: network/wireguard/gateway
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: elevate/media
diff --git a/dan/sk-cloudio.yml b/dan/sk-cloudio.yml
index 732d4798..97c21039 100644
--- a/dan/sk-cloudio.yml
+++ b/dan/sk-cloudio.yml
@@ -13,7 +13,7 @@
   - role: storage/zfs/sanoid
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: postfix/base
   - role: apps/nextcloud
diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml
index 9e5bbe37..1cb392d4 100644
--- a/dan/sk-tomnext-nc.yml
+++ b/dan/sk-tomnext-nc.yml
@@ -12,7 +12,7 @@
   - role: storage/zfs/sanoid
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: postfix/base
   - role: apps/nextcloud
diff --git a/roles/apps/coturn/tasks/main.yml b/roles/apps/coturn/tasks/main.yml
index 838385ea..42ccd2b3 100644
--- a/roles/apps/coturn/tasks/main.yml
+++ b/roles/apps/coturn/tasks/main.yml
@@ -72,7 +72,7 @@
 - name: get certificate using acmetool
   when: not coturn_install_nginx_vhost
   import_role:
-    name: acmetool/cert
+    name: x509/acmetool/cert
   vars:
     acmetool_cert_name: "coturn-{{ coturn_realm }}"
     acmetool_cert_hostnames: "{{ coturn_hostnames }}"
diff --git a/roles/apps/mumble/tasks/main.yml b/roles/apps/mumble/tasks/main.yml
index 0e16e54b..91932b05 100644
--- a/roles/apps/mumble/tasks/main.yml
+++ b/roles/apps/mumble/tasks/main.yml
@@ -60,7 +60,7 @@
 
 - name: get certificate using acmetool
   import_role:
-    name: acmetool/cert
+    name: x509/acmetool/cert
   vars:
     acmetool_cert_name: "mumble-{{ mumble_instance }}"
     acmetool_cert_hostnames: "{{ mumble_hostnames }}"
diff --git a/roles/nginx/vhost/tasks/acme.yml b/roles/nginx/vhost/tasks/acme.yml
index 21ab8695..8a6cddb7 100644
--- a/roles/nginx/vhost/tasks/acme.yml
+++ b/roles/nginx/vhost/tasks/acme.yml
@@ -38,7 +38,7 @@
 
 - name: get certificate using acmetool
   import_role:
-    name: acmetool/cert
+    name: x509/acmetool/cert
   vars:
     acmetool_cert_name: "{{ nginx_vhost.name }}"
     acmetool_cert_hostnames: "{{ nginx_vhost.hostnames }}"
diff --git a/roles/acmetool/base/defaults/main.yml b/roles/x509/acmetool/base/defaults/main.yml
index df82d26c..df82d26c 100644
--- a/roles/acmetool/base/defaults/main.yml
+++ b/roles/x509/acmetool/base/defaults/main.yml
diff --git a/roles/acmetool/base/tasks/main.yml b/roles/x509/acmetool/base/tasks/main.yml
index 5f2ae4ab..5f2ae4ab 100644
--- a/roles/acmetool/base/tasks/main.yml
+++ b/roles/x509/acmetool/base/tasks/main.yml
diff --git a/roles/acmetool/base/tasks/selfsigned.yml b/roles/x509/acmetool/base/tasks/selfsigned.yml
index 449fbdb9..449fbdb9 100644
--- a/roles/acmetool/base/tasks/selfsigned.yml
+++ b/roles/x509/acmetool/base/tasks/selfsigned.yml
diff --git a/roles/acmetool/base/templates/acme-reload.j2 b/roles/x509/acmetool/base/templates/acme-reload.j2
index a679bc7d..a679bc7d 100644
--- a/roles/acmetool/base/templates/acme-reload.j2
+++ b/roles/x509/acmetool/base/templates/acme-reload.j2
diff --git a/roles/acmetool/base/templates/responses.j2 b/roles/x509/acmetool/base/templates/responses.j2
index 981eba90..981eba90 100644
--- a/roles/acmetool/base/templates/responses.j2
+++ b/roles/x509/acmetool/base/templates/responses.j2
diff --git a/roles/acmetool/base/templates/systemd-override.conf.j2 b/roles/x509/acmetool/base/templates/systemd-override.conf.j2
index 5de58bdd..5de58bdd 100644
--- a/roles/acmetool/base/templates/systemd-override.conf.j2
+++ b/roles/x509/acmetool/base/templates/systemd-override.conf.j2
diff --git a/roles/acmetool/cert/defaults/main.yml b/roles/x509/acmetool/cert/defaults/main.yml
index ab0afaa3..ab0afaa3 100644
--- a/roles/acmetool/cert/defaults/main.yml
+++ b/roles/x509/acmetool/cert/defaults/main.yml
diff --git a/roles/acmetool/cert/filter_plugins/acme_certs.py b/roles/x509/acmetool/cert/filter_plugins/acme_certs.py
index 179f71e9..179f71e9 100644
--- a/roles/acmetool/cert/filter_plugins/acme_certs.py
+++ b/roles/x509/acmetool/cert/filter_plugins/acme_certs.py
diff --git a/roles/acmetool/cert/handlers/main.yml b/roles/x509/acmetool/cert/handlers/main.yml
index 08892c18..08892c18 100644
--- a/roles/acmetool/cert/handlers/main.yml
+++ b/roles/x509/acmetool/cert/handlers/main.yml
diff --git a/roles/acmetool/cert/tasks/main.yml b/roles/x509/acmetool/cert/tasks/main.yml
index e97aab84..e97aab84 100644
--- a/roles/acmetool/cert/tasks/main.yml
+++ b/roles/x509/acmetool/cert/tasks/main.yml
diff --git a/spreadspace/glt-coturn.yml b/spreadspace/glt-coturn.yml
index b3fbcacf..91641cd5 100644
--- a/spreadspace/glt-coturn.yml
+++ b/spreadspace/glt-coturn.yml
@@ -10,6 +10,6 @@
   - role: apt-repo/spreadspace
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: apps/coturn
   - role: apps/mumble
diff --git a/spreadspace/glt-meet1.yml b/spreadspace/glt-meet1.yml
index 1bf4d1fb..b2447cd8 100644
--- a/spreadspace/glt-meet1.yml
+++ b/spreadspace/glt-meet1.yml
@@ -10,6 +10,6 @@
   - role: apt-repo/spreadspace
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: apps/jitsi/meet
diff --git a/spreadspace/glt-meet2.yml b/spreadspace/glt-meet2.yml
index b327d267..f91dd3a8 100644
--- a/spreadspace/glt-meet2.yml
+++ b/spreadspace/glt-meet2.yml
@@ -10,6 +10,6 @@
   - role: apt-repo/spreadspace
   - role: kubernetes/base
   - role: kubernetes/standalone/base
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - role: apps/jitsi/meet
diff --git a/spreadspace/glt-stream.yml b/spreadspace/glt-stream.yml
index bff0f67e..145f8671 100644
--- a/spreadspace/glt-stream.yml
+++ b/spreadspace/glt-stream.yml
@@ -8,7 +8,7 @@
   - role: core/zsh
   - role: core/ntp
   - role: apt-repo/spreadspace
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - name: storage/lvm/volume
     lvm_volume:
diff --git a/spreadspace/sgg-icecast.yml b/spreadspace/sgg-icecast.yml
index 92349d24..bfe67bde 100644
--- a/spreadspace/sgg-icecast.yml
+++ b/spreadspace/sgg-icecast.yml
@@ -11,7 +11,7 @@
   - role: kubernetes/base
   - role: kubernetes/standalone/base
   - role: streaming/icecast
-  - role: acmetool/base
+  - role: x509/acmetool/base
   - role: nginx/base
   - name: storage/lvm/volume
     lvm_volume: