diff --git a/domain.yml b/domain.yml index e600833..fad1043 100644 --- a/domain.yml +++ b/domain.yml @@ -13,6 +13,7 @@ dhcprange_start: 192.168.1.10 dhcprange_end: 192.168.1.50 extdnsserver1: 208.67.222.222 extdnsserver2: 208.67.220.220 +org_email: info@bglug.it org_company: Istituto Comprensivo 'Mastri Caravaggini' org_countrycode: IT org_department: "Laboratorio 1" diff --git a/roles/init/tasks/domaininfo.yml b/roles/init/tasks/domaininfo.yml index 30d2232..64f6b20 100644 --- a/roles/init/tasks/domaininfo.yml +++ b/roles/init/tasks/domaininfo.yml @@ -1,7 +1,7 @@ --- # Copia le configurazioni per il dominio in locale sul server. - name: Copia le configurazioni di dominio. - copy: src=../../../domain.yml dest=/etc/domain.yml force=no + copy: src=../../../domain.yml dest=/etc/domain.yml force=yes sudo: yes - name: Creo la cartella per le configurazioni di Ansible diff --git a/roles/nethcfg/tasks/reconfig_srv.yml b/roles/nethcfg/tasks/reconfig_srv.yml index 2d2ea7f..1d792c9 100644 --- a/roles/nethcfg/tasks/reconfig_srv.yml +++ b/roles/nethcfg/tasks/reconfig_srv.yml @@ -205,13 +205,16 @@ ignore_errors: true register: chk_crt changed_when: "'CommonName={{ ansible_local.domain.serverfqdn }}' not in chk_crt.stdout" + tags: regen-ca - name: Completo la configurazione per produzione certificato - shell: /sbin/e-smith/db configuration setprop pki CertificateDuration 3650 CommonName {{ ansible_local.domain.serverfqdn }} + shell: /sbin/e-smith/db configuration setprop pki CertificateDuration 3650 CommonName {{ ansible_local.domain.serverfqdn }} CountryCode {{ ansible_local.domain.org_countrycode }} EmailAddress {{ ansible_local.domain.org_email }} Locality "{{ ansible_local.domain.org_city }}" Organization "{{ ansible_local.domain.org_company }}" sudo: yes - when: chk_crt|changed + tags: regen-ca + when: chk_crt|changed or force_regen_ca|bool - name: Rigenero il certificato con le informazioni inserite shell: /sbin/e-smith/signal-event certificate-update sudo: yes + when: chk_crt|changed or force_regen_ca|bool tags: regen-ca