From 60e1ea5f2d88648dbe09e10eb4bffa0dd63f0a5f Mon Sep 17 00:00:00 2001 From: Drazen Date: Thu, 14 Mar 2024 11:56:15 +0100 Subject: [PATCH 1/2] Upading-ssl-vars --- roles/debian/apache/defaults/main.yml | 1 + roles/debian/jenkins/tasks/main.yml | 1 + roles/debian/ldap_server/defaults/main.yml | 1 + roles/debian/nginx/defaults/main.yml | 1 + roles/debian/ossec/defaults/main.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/roles/debian/apache/defaults/main.yml b/roles/debian/apache/defaults/main.yml index 0b187f183..b6705c0e4 100644 --- a/roles/debian/apache/defaults/main.yml +++ b/roles/debian/apache/defaults/main.yml @@ -41,6 +41,7 @@ apache: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domain: "{{ _domain_name }}" handling: selfsigned # Sample LetsEncrypt config, because include_role will not merge defaults these all need providing: diff --git a/roles/debian/jenkins/tasks/main.yml b/roles/debian/jenkins/tasks/main.yml index a14ae2f7b..6262d4478 100644 --- a/roles/debian/jenkins/tasks/main.yml +++ b/roles/debian/jenkins/tasks/main.yml @@ -21,6 +21,7 @@ name: debian/ssl vars: ssl: + replace_existing: false domain: "{{ jenkins.server_name }}" services: [] diff --git a/roles/debian/ldap_server/defaults/main.yml b/roles/debian/ldap_server/defaults/main.yml index 8178688a0..249fff7ec 100644 --- a/roles/debian/ldap_server/defaults/main.yml +++ b/roles/debian/ldap_server/defaults/main.yml @@ -24,6 +24,7 @@ ldap_server: # olcTLSCertificateFile: /etc/letsencrypt/live/{{ _domain_name }}/cert.pem # olcTLSCertificateKeyFile: /etc/letsencrypt/live/{{ _domain_name }}/privkey.pem ssl: # @see the 'ssl' role - does nothing by default. + replace_existing: false domain: "{{ _domain_name }}" handling: "unmanaged" key: "" diff --git a/roles/debian/nginx/defaults/main.yml b/roles/debian/nginx/defaults/main.yml index 4b8ba307d..9d0620e92 100644 --- a/roles/debian/nginx/defaults/main.yml +++ b/roles/debian/nginx/defaults/main.yml @@ -41,6 +41,7 @@ nginx: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domains: - "{{ _domain_name }}" handling: selfsigned diff --git a/roles/debian/ossec/defaults/main.yml b/roles/debian/ossec/defaults/main.yml index b60a9c15a..5c8c681c8 100644 --- a/roles/debian/ossec/defaults/main.yml +++ b/roles/debian/ossec/defaults/main.yml @@ -26,6 +26,7 @@ ossec: ssl: domain: "ossec.example.com" handling: "selfsigned" + replace_existing: false syscheck: frequency: 79200 From ee15bc2fa6ebfe7467debb7e5097c57d2eaac39f Mon Sep 17 00:00:00 2001 From: Drazen Date: Thu, 14 Mar 2024 12:04:31 +0100 Subject: [PATCH 2/2] Building-docs --- docs/roles/debian/apache.md | 1 + docs/roles/debian/ldap_server.md | 1 + docs/roles/debian/nginx.md | 1 + docs/roles/debian/ossec.md | 1 + roles/debian/apache/README.md | 1 + roles/debian/ldap_server/README.md | 1 + roles/debian/nginx/README.md | 1 + roles/debian/ossec/README.md | 1 + 8 files changed, 8 insertions(+) diff --git a/docs/roles/debian/apache.md b/docs/roles/debian/apache.md index c39087ef8..3902bfdab 100644 --- a/docs/roles/debian/apache.md +++ b/docs/roles/debian/apache.md @@ -51,6 +51,7 @@ apache: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domain: "{{ _domain_name }}" handling: selfsigned # Sample LetsEncrypt config, because include_role will not merge defaults these all need providing: diff --git a/docs/roles/debian/ldap_server.md b/docs/roles/debian/ldap_server.md index 6514e4779..2bcd0b378 100644 --- a/docs/roles/debian/ldap_server.md +++ b/docs/roles/debian/ldap_server.md @@ -90,6 +90,7 @@ ldap_server: # olcTLSCertificateFile: /etc/letsencrypt/live/{{ _domain_name }}/cert.pem # olcTLSCertificateKeyFile: /etc/letsencrypt/live/{{ _domain_name }}/privkey.pem ssl: # @see the 'ssl' role - does nothing by default. + replace_existing: false domain: "{{ _domain_name }}" handling: "unmanaged" key: "" diff --git a/docs/roles/debian/nginx.md b/docs/roles/debian/nginx.md index d9ff961ff..340ef09da 100644 --- a/docs/roles/debian/nginx.md +++ b/docs/roles/debian/nginx.md @@ -53,6 +53,7 @@ nginx: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domains: - "{{ _domain_name }}" handling: selfsigned diff --git a/docs/roles/debian/ossec.md b/docs/roles/debian/ossec.md index 6126a0907..30d418e5d 100644 --- a/docs/roles/debian/ossec.md +++ b/docs/roles/debian/ossec.md @@ -34,6 +34,7 @@ ossec: ssl: domain: "ossec.example.com" handling: "selfsigned" + replace_existing: false syscheck: frequency: 79200 diff --git a/roles/debian/apache/README.md b/roles/debian/apache/README.md index c39087ef8..3902bfdab 100644 --- a/roles/debian/apache/README.md +++ b/roles/debian/apache/README.md @@ -51,6 +51,7 @@ apache: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domain: "{{ _domain_name }}" handling: selfsigned # Sample LetsEncrypt config, because include_role will not merge defaults these all need providing: diff --git a/roles/debian/ldap_server/README.md b/roles/debian/ldap_server/README.md index 6514e4779..2bcd0b378 100644 --- a/roles/debian/ldap_server/README.md +++ b/roles/debian/ldap_server/README.md @@ -90,6 +90,7 @@ ldap_server: # olcTLSCertificateFile: /etc/letsencrypt/live/{{ _domain_name }}/cert.pem # olcTLSCertificateKeyFile: /etc/letsencrypt/live/{{ _domain_name }}/privkey.pem ssl: # @see the 'ssl' role - does nothing by default. + replace_existing: false domain: "{{ _domain_name }}" handling: "unmanaged" key: "" diff --git a/roles/debian/nginx/README.md b/roles/debian/nginx/README.md index d9ff961ff..340ef09da 100644 --- a/roles/debian/nginx/README.md +++ b/roles/debian/nginx/README.md @@ -53,6 +53,7 @@ nginx: webroot: "/var/www/html" project_type: "flat" ssl: # @see the 'ssl' role. + replace_existing: false domains: - "{{ _domain_name }}" handling: selfsigned diff --git a/roles/debian/ossec/README.md b/roles/debian/ossec/README.md index 6126a0907..30d418e5d 100644 --- a/roles/debian/ossec/README.md +++ b/roles/debian/ossec/README.md @@ -34,6 +34,7 @@ ossec: ssl: domain: "ossec.example.com" handling: "selfsigned" + replace_existing: false syscheck: frequency: 79200