From 2048720f0c181d68edd21e8234d509194827facb Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 21 Apr 2015 23:40:26 +0200 Subject: [PATCH] Sistemato task di gestione del client su utente amgmt. Sistemate alcune configurazioni con nethserver. --- roles/init/tasks/main.yml | 1 + roles/init/tasks/mgmtuser.yml | 1 - roles/setup/handlers/main.yml | 7 +++++++ roles/setup/tasks/ansible.yml | 5 +---- roles/setup/tasks/neth_config.yml | 15 ++++++++++----- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 roles/setup/handlers/main.yml diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index da356f7..a09c0e7 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml @@ -9,6 +9,7 @@ when: sysconfig_productname|changed - include: selinux-binding.yml + when: ansible_os_family == "RedHat" - include: mgmtuser.yml diff --git a/roles/init/tasks/mgmtuser.yml b/roles/init/tasks/mgmtuser.yml index f087646..88c5e1d 100644 --- a/roles/init/tasks/mgmtuser.yml +++ b/roles/init/tasks/mgmtuser.yml @@ -1,5 +1,4 @@ --- - - name: Creazione account di gestione Ansible user: name=amgmt comment="Ansible Management User" group=wheel state=present password=$6$rounds=100000$XvHuMoXtpCksx379$nhlfUn38.oBB7JrDrtwfUisw8T0Bg5InzFq1fw31mcEmGZ2AYFkFK2zC2g04lSfw.kpdSgqH3Dl5q9r1fY6.k. diff --git a/roles/setup/handlers/main.yml b/roles/setup/handlers/main.yml new file mode 100644 index 0000000..686cd9e --- /dev/null +++ b/roles/setup/handlers/main.yml @@ -0,0 +1,7 @@ +--- +- name: ntp save + shell: /sbin/e-smith/signal-event nethserver-ntp-save + sudo: yes + +- name: group create + shell: /sbin/e-smith/signal-event group-create diff --git a/roles/setup/tasks/ansible.yml b/roles/setup/tasks/ansible.yml index 1851998..03e5678 100644 --- a/roles/setup/tasks/ansible.yml +++ b/roles/setup/tasks/ansible.yml @@ -2,15 +2,12 @@ - name: Verifica installazione git yum: name=git state=present - sudo: yes tags: git - name: Download della gestione client con ansible git: repo: "https://github.com/syntaxerrormmm/ps-clientmgmt.git" - dest: /root/clientmgmt - sudo_user: root - sudo: yes + dest: /home/amgmt/clientmgmt tags: - git - ansible diff --git a/roles/setup/tasks/neth_config.yml b/roles/setup/tasks/neth_config.yml index 4b1127e..f2d4642 100644 --- a/roles/setup/tasks/neth_config.yml +++ b/roles/setup/tasks/neth_config.yml @@ -6,23 +6,28 @@ tags: dns - name: Configuro sincronizzazione dell'ora con NTP1 - shell: /sbin/e-smith/db configuration setprop ntpd NTPServer ntp1.inrim.it status enabled && /sbin/e-smith/signal-event nethserver-ntp-save + shell: /sbin/e-smith/db configuration setprop ntpd NTPServer ntp1.inrim.it status enabled sudo: yes + notify: + - ntp save tags: ntp - name: Lancio aggiornamenti del clamav - shell: /sbin/e-smith/signal-event nethserver-squidclamav-updateupdate + shell: /sbin/e-smith/signal-event nethserver-squidclamav-update sudo: yes + tags: clamav - name: Verifico la presenza del gruppo shell: /sbin/e-smith/db accounts show domusers sudo: yes tags: groups - changed_when: "'domusers=group' not in check_domusers.stdout" register: check_domusers + ignore_errors: yes - name: Aggiungo gruppo "Domain users" - shell: /sbin/e-smith/db accounts set domusers group && /sbin/e-smith/db accounts setprop domusers Description 'Domain Users' Gid 502 Members admin Removable no && /sbin/e-smith/signal-event group-create + shell: /sbin/e-smith/db accounts set domusers group && /sbin/e-smith/db accounts setprop domusers Description 'Domain Users' Gid 502 Members admin Removable no sudo: yes tags: groups - when: check_domusers|changed + notify: + - group create + when: check_domusers|failed