diff --git a/etc/host_vars/localhost.example b/host_vars/localhost.example similarity index 100% rename from etc/host_vars/localhost.example rename to host_vars/localhost.example diff --git a/postint.yml.README b/postint.yml.README index d1e9437..ccbd8f6 100644 --- a/postint.yml.README +++ b/postint.yml.README @@ -28,9 +28,9 @@ Après la description suivent des exemples de ces variables. - default_packages_debian : la liste des packages debian a installer par defaut - ansible_fqdn : le nom a donner au serveur - description : La description du serveur (s'affichera a la connexion) - - ntp_server1 : le premier serveur NTP a utiliser - - ntp_server2 : le deuxième serveur ntp a installer + - ntp_servers : liste de serveurs NTP à utiliser - disable_ipv6 : IPv6 doit il etre desactive ou non + - tzdata_timezone: Permet de définir une timezone personnalisée (Europe/Paris est définie par défaut) ### Exemples de variables ### fichier : /etc/ansible/group_vars/all : @@ -48,9 +48,8 @@ ansible_fqdn: serveur-debian.exemple.com description: Bienvenue sur ce serveur debian -ntp_server1: 0.fr.pool.ntp.org -ntp_server2: 1.fr.pool.ntp.org +ntp_servers: + - 0.fr.pool.ntp.org + - 1.fr.pool.ntp.org disable_ipv6: yes - - diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index 30bb051..6cb4216 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -40,5 +40,8 @@ - name: apt-update command: apt-get update -# vim: set textwidth=0 ft=yaml ts=2 sw=2 expandtab: +- name: update timezone + command: dpkg-reconfigure --frontend noninteractive tzdata + +# vim: set textwidth=0 ft=yaml ts=2 sw=2 expandtab: diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0593770..776eb24 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -10,7 +10,6 @@ when: ansible_distribution == 'Debian' # Check mandatory variables - - name: Check vars fail: msg="Missing variable admin_ssh_keys" when: admin_ssh_keys is not defined @@ -32,17 +31,16 @@ when: disable_ipv6 is not defined # SSH - - name: Deploy SSH keys tags: ssh_keys authorized_key: user=root key="{{item}}" - with_items: "{{admin_ssh_keys}}" + with_items: admin_ssh_keys # Packages - name: Install default packages Debian. apt: pkg={{item}} state=installed - with_items: "{{ default_packages_debian }}" + with_items: default_packages_debian when: ansible_distribution == 'Debian' # Configure NTP @@ -89,11 +87,11 @@ debconf: name=locales question='locales/locales_to_be_generated' value='fr_FR.UTF-8, UTF-8' vtype='multiselect' when: ansible_distribution == 'Debian' -- name: Set the timezone - tags: environ - debconf: name=tzdata question='tzdata/Zones/Etc' value='UTC' vtype='select' - debconf: name=tzdata question='tzdata/Areas' value='Europe' vtype='select' - debconf: name=tzdata question='tzdata/Zones/Europe' value='Paris' vtype='select' +- name: Set timezone + copy: content='{{ tzdata_timezone | default('Europe/Paris') }}' + dest=/etc/timezone owner=root group=root mode=0644 + notify: + - update timezone when: ansible_distribution == 'Debian' - name: Disable IPv6 (need reboot) diff --git a/roles/common/templates/etc-ntp.conf.j2 b/roles/common/templates/etc-ntp.conf.j2 index 0a7b421..3b2aca5 100644 --- a/roles/common/templates/etc-ntp.conf.j2 +++ b/roles/common/templates/etc-ntp.conf.j2 @@ -9,7 +9,6 @@ filegen clockstats file clockstats type day enable {% for server in ntp_servers %} server {{ server }} restrict {{ server }} nomodify nopeer -restrict {{ server }} nomodify nopeer {% endfor %} restrict default ignore restrict -6 default ignore