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

This commit is contained in:
roydfalk 2024-06-25 11:32:36 +02:00
parent 0b303849a8
commit 61b39794e8
2 changed files with 10 additions and 12 deletions

View file

@ -1,8 +1,6 @@
{ {
"var_tlscert_existing_domain": "foo.example.org",
"var_tlscert_existing_key_path": "/tmp/key.pem", "var_tlscert_existing_key_path": "/tmp/key.pem",
"var_tlscert_existing_cert_path": "/tmp/cert.pem", "var_tlscert_existing_cert_path": "/tmp/cert.pem",
"var_tlscert_existing_fullchain_path": "/tmp/fullchain.pem", "var_tlscert_existing_fullchain_path": "/tmp/fullchain.pem"
"var_tlscert_existing_domain_base": "example.org",
"var_tlscert_existing_domain_path": "foo",
"var_tlscert_existing_ssl_directory": "/etc/ssl"
} }

View file

@ -3,10 +3,10 @@
"name": "directories", "name": "directories",
"become": true, "become": true,
"loop": [ "loop": [
"{{var_tlscert_existing_ssl_directory}}/private", "/etc/ssl/private",
"{{var_tlscert_existing_ssl_directory}}/csr", "/etc/ssl/csr",
"{{var_tlscert_existing_ssl_directory}}/certs", "/etc/ssl/certs",
"{{var_tlscert_existing_ssl_directory}}/fullchains" "/etc/ssl/fullchains"
], ],
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
@ -18,7 +18,7 @@
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.copy": {
"src": "{{var_tlscert_existing_key_path}}", "src": "{{var_tlscert_existing_key_path}}",
"dest": "{{var_tlscert_existing_ssl_directory}}/private/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" "dest": "/etc/ssl/private/{{var_tlscert_existing_domain}}.pem"
} }
}, },
{ {
@ -26,7 +26,7 @@
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.copy": {
"src": "{{var_tlscert_existing_cert_path}}", "src": "{{var_tlscert_existing_cert_path}}",
"dest": "{{var_tlscert_existing_ssl_directory}}/certs/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" "dest": "/etc/ssl/certs/{{var_tlscert_existing_domain}}.pem"
} }
}, },
{ {
@ -35,7 +35,7 @@
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.copy": {
"src": "{{var_tlscert_existing_fullchain_path}}", "src": "{{var_tlscert_existing_fullchain_path}}",
"dest": "{{var_tlscert_existing_ssl_directory}}/fullchains/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" "dest": "/etc/ssl/fullchains/{{var_tlscert_existing_domain}}.pem"
} }
}, },
{ {
@ -43,7 +43,7 @@
"when": "var_tlscert_existing_fullchain_path == None", "when": "var_tlscert_existing_fullchain_path == None",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "cat {{var_tlscert_existing_ssl_directory}}/certs/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem > {{var_tlscert_existing_ssl_directory}}/fullchains/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" "cmd": "cat /etc/ssl/certs/{{var_tlscert_existing_domain}}.pem > /etc/ssl/fullchains/{{var_tlscert_existing_domain}}.pem"
} }
} }
] ]