From 7a2b2c0b48baae1a1a14a11529afbb8bf915772f Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Thu, 7 Oct 2021 18:03:05 +0000
Subject: [PATCH] Re organized internal CA directories

---
 roles/dovecot/tasks/main.yml         | 2 +-
 roles/nginx/site/tasks/main.yml      | 4 ++--
 roles/nsd/tasks/main.yml             | 4 ++--
 roles/pki/tasks/main.yml             | 2 +-
 roles/sendmail/tasks/main.yml        | 4 ++--
 roles/thinlinc-server/tasks/main.yml | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index 603eb89..51de185 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -36,7 +36,7 @@
     group: "{{ ansible_wheel }}"
   with_first_found:
     - "/srv/letsencrypt/live/{{ mail_server }}/fullchain.pem"
-    - "/srv/ca/certs/{{ inventory_hostname }}.crt"
+    - "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
   tags: certificates
   notify: restart dovecot
 
diff --git a/roles/nginx/site/tasks/main.yml b/roles/nginx/site/tasks/main.yml
index d6c7cc3..e4b65b7 100644
--- a/roles/nginx/site/tasks/main.yml
+++ b/roles/nginx/site/tasks/main.yml
@@ -41,7 +41,7 @@
     validate: /usr/bin/openssl x509 -in %s -noout
   with_first_found:
     - "/srv/letsencrypt/live/{{ site }}/fullchain.pem"
-    - "/srv/ca/certs/{{ site }}.crt"
-    - "/srv/ca/certs/{{ inventory_hostname }}.crt"
+    - "/srv/ca/certs/hosts/{{ site }}.crt"
+    - "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
   tags: certificates
   notify: restart nginx
diff --git a/roles/nsd/tasks/main.yml b/roles/nsd/tasks/main.yml
index fc27374..e156dca 100644
--- a/roles/nsd/tasks/main.yml
+++ b/roles/nsd/tasks/main.yml
@@ -22,8 +22,8 @@
     group: "{{ ansible_wheel }}"
   with_first_found:
     - "/srv/letsencrypt/live/{{ nsd_server }}/fullchain.pem"
-    - "/srv/ca/certs/{{ site }}.crt"
-    - "/srv/ca/certs/{{ inventory_hostname }}.crt"
+    - "/srv/ca/certs/hosts/{{ site }}.crt"
+    - "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
   tags: certificates
   notify: restart nsd
 
diff --git a/roles/pki/tasks/main.yml b/roles/pki/tasks/main.yml
index 0c7eb8c..ac5c510 100644
--- a/roles/pki/tasks/main.yml
+++ b/roles/pki/tasks/main.yml
@@ -24,7 +24,7 @@
 
 - name: copy host certificate
   copy:
-    src: "/srv/ca/certs/{{ inventory_hostname }}.crt"
+    src: "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
     dest: "{{ tls_certs }}/{{ inventory_hostname }}.crt"
     mode: 0644
     owner: root
diff --git a/roles/sendmail/tasks/main.yml b/roles/sendmail/tasks/main.yml
index b926af9..67b71c0 100644
--- a/roles/sendmail/tasks/main.yml
+++ b/roles/sendmail/tasks/main.yml
@@ -41,8 +41,8 @@
     validate: /usr/bin/openssl x509 -in %s -noout
   with_first_found:
     - "/srv/letsencrypt/live/{{ mail_server }}/cert.pem"
-    - "/srv/ca/certs/{{ mail_server }}.crt"
-    - "/srv/ca/certs/{{ inventory_hostname }}.crt"
+    - "/srv/ca/certs/hosts/{{ mail_server }}.crt"
+    - "/srv/ca/certs/hosts/{{ inventory_hostname }}.crt"
   tags: certificates
   notify: restart sendmail
 
diff --git a/roles/thinlinc-server/tasks/main.yml b/roles/thinlinc-server/tasks/main.yml
index 7afb77f..e26259b 100644
--- a/roles/thinlinc-server/tasks/main.yml
+++ b/roles/thinlinc-server/tasks/main.yml
@@ -70,7 +70,7 @@
     group: "{{ ansible_wheel }}"
   with_first_found:
     - "/srv/letsencrypt/live/{{ inventory_hostname }}/privkey.pem"
-    - "/srv/ca/certs/{{ inventory_hostname }}.key"
+    - "/srv/ca/certs/hosts/{{ inventory_hostname }}.key"
   tags: certificates
   notify: restart tlwebaccess