[mod] role:tlscert_selfsigned:remove var for ssl-path and unify domain vars

This commit is contained in:
roydfalk 2024-06-25 11:33:12 +02:00
parent 61b39794e8
commit b3cd34f0ac
2 changed files with 14 additions and 16 deletions

View file

@ -1,5 +1,3 @@
{ {
"var_tlscert_selfsigned_domain_base": "example.org", "var_tlscert_selfsigned_domain": "foo.example.org"
"var_tlscert_selfsigned_domain_path": "foo",
"var_tlscert_selfsigned_ssl_directory": "/etc/ssl"
} }

View file

@ -14,10 +14,10 @@
"name": "setup directories", "name": "setup directories",
"become": true, "become": true,
"loop": [ "loop": [
"{{var_tlscert_selfsigned_ssl_directory}}/private", "/etc/ssl/private",
"{{var_tlscert_selfsigned_ssl_directory}}/csr", "/etc/ssl/csr",
"{{var_tlscert_selfsigned_ssl_directory}}/certs", "/etc/ssl/certs",
"{{var_tlscert_selfsigned_ssl_directory}}/fullchains" "/etc/ssl/fullchains"
], ],
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
@ -28,19 +28,19 @@
"name": "csr | generate private key", "name": "csr | generate private key",
"become": true, "become": true,
"community.crypto.openssl_privatekey": { "community.crypto.openssl_privatekey": {
"path": "{{var_tlscert_selfsigned_ssl_directory}}/private/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem" "path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem"
} }
}, },
{ {
"name": "csr | execute", "name": "csr | execute",
"become": true, "become": true,
"community.crypto.openssl_csr": { "community.crypto.openssl_csr": {
"privatekey_path": "{{var_tlscert_selfsigned_ssl_directory}}/private/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem", "privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem",
"common_name": "{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}", "common_name": "{{var_tlscert_selfsigned_domain}}",
"subject_alt_name": [ "subject_alt_name": [
"DNS:{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}" "DNS:{{var_tlscert_selfsigned_domain}}"
], ],
"path": "{{var_tlscert_selfsigned_ssl_directory}}/csr/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem" "path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem"
}, },
"register": "temp_csr" "register": "temp_csr"
}, },
@ -48,17 +48,17 @@
"name": "generate certificate", "name": "generate certificate",
"become": true, "become": true,
"community.crypto.x509_certificate": { "community.crypto.x509_certificate": {
"privatekey_path": "{{var_tlscert_selfsigned_ssl_directory}}/private/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem", "privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem",
"csr_path": "{{var_tlscert_selfsigned_ssl_directory}}/csr/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem", "csr_path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem",
"provider": "selfsigned", "provider": "selfsigned",
"path": "{{var_tlscert_selfsigned_ssl_directory}}/certs/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem" "path": "/etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem"
} }
}, },
{ {
"name": "compose fullchain", "name": "compose fullchain",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "cat {{var_tlscert_selfsigned_ssl_directory}}/certs/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem > {{var_tlscert_selfsigned_ssl_directory}}/fullchains/{{var_tlscert_selfsigned_domain_path}}.{{var_tlscert_selfsigned_domain_base}}.pem" "cmd": "cat /etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem > /etc/ssl/fullchains/{{var_tlscert_selfsigned_domain}}.pem"
} }
} }
] ]