each server own cert

roles/rproxy/tasks/main.yml

@@ -56,32 +56,6 @@
         src: files/RootCA.key
         dest: '{{ rproxy_dir }}/certs/RootCA.key'
 
-    - name: Copy server certificate cnf
-      ansible.builtin.template:
-        src: templates/server.cnf.j2
-        dest: '{{ rproxy_dir }}/certs/server.cnf'
-
-    - name: Generate server key
-      ansible.builtin.shell:
-        cmd: 'openssl genrsa -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.key 2048'
-
-    - name: Generate server csr
-      ansible.builtin.shell:
-        cmd: 'openssl req -key {{ rproxy_dir }}/certs/{{ domain.stdout }}.key -new -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.csr -config {{ rproxy_dir }}/certs/server.cnf'
-
-    - name: Sign server certificate
-      ansible.builtin.shell:
-        cmd: 'openssl x509 -req -CA {{ rproxy_dir }}/certs/RootCA.crt -CAkey {{ rproxy_dir }}/certs/RootCA.key -in {{ rproxy_dir }}/certs/{{ domain.stdout }}.csr -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.crt -CAcreateserial'
-
-    - name: Create fullchain certificate
-      ansible.builtin.shell:
-        cmd: 'cat {{ rproxy_dir }}/certs/RootCA.crt >> {{ rproxy_dir }}/certs/{{ domain.stdout }}.crt'
-
-    - name: Delete csr
-      ansible.builtin.file:
-        path: "{{ rproxy_dir }}/certs/{{ domain.stdout }}.csr"
-        state: absent
-
     - name: Start rproxy
       community.docker.docker_compose:
         project_src: "{{ rproxy_dir }}"
@@ -94,6 +68,37 @@
         src: templates/server.conf.j2
         dest: "{{ rproxy_dir }}/sites/{{  rproxy_service_name  }}.conf"
 
+    - name: Copy server certificate cnf
+      ansible.builtin.template:
+        src: templates/server.cnf.j2
+        dest: '{{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.cnf'
+
+    - name: Generate server key
+      ansible.builtin.shell:
+        cmd: 'openssl genrsa -out {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.key 2048'
+
+    - name: Generate server csr
+      ansible.builtin.shell:
+        cmd: 'openssl req -key {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.key -new -out {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.csr -config {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.cnf'
+
+    - name: Sign server certificate
+      ansible.builtin.shell:
+        cmd: 'openssl x509 -req -CA {{ rproxy_dir }}/certs/RootCA.crt -CAkey {{ rproxy_dir }}/certs/RootCA.key -in {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.csr -out {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.crt -CAcreateserial'
+
+    - name: Create fullchain certificate
+      ansible.builtin.shell:
+        cmd: 'cat {{ rproxy_dir }}/certs/RootCA.crt >> {{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.crt'
+
+    - name: Delete csr
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.csr"
+        state: absent
+
+    - name: Delete cnf
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}/certs/{{  rproxy_service_name  }}.cnf"
+        state: absent
+
     - name: Restart rproxy
       community.docker.docker_compose:
         project_src: "{{ rproxy_dir }}"