From dc9e5819c996c75cdcb349daec0d7c112f4aed41 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 11 Sep 2015 23:12:14 +0200 Subject: [PATCH] Managing domain groups in a separate file. Updated doraemon required version. Adding installation for networkpackagemanager. --- roles/client-install/meta/main.yml | 1 + roles/doraemon/defaults/main.yml | 2 +- roles/nethcfg/tasks/domain_groups.yml | 49 +++++++++++++++++++++++++++ roles/nethcfg/tasks/main.yml | 4 +++ roles/nethcfg/tasks/reconfig_srv.yml | 32 ----------------- roles/npm/defaults/main.yml | 2 ++ roles/npm/tasks/main.yml | 5 +++ roles/npm/tasks/npm.yml | 16 +++++++++ 8 files changed, 78 insertions(+), 33 deletions(-) create mode 100644 roles/nethcfg/tasks/domain_groups.yml create mode 100644 roles/npm/defaults/main.yml create mode 100644 roles/npm/tasks/main.yml create mode 100644 roles/npm/tasks/npm.yml diff --git a/roles/client-install/meta/main.yml b/roles/client-install/meta/main.yml index eff341b..996316e 100644 --- a/roles/client-install/meta/main.yml +++ b/roles/client-install/meta/main.yml @@ -5,4 +5,5 @@ dependencies: - { role: ansible-pull, tags: [ 'client-install' ] } - { role: ubuntu-mirror, tags: [ 'client-install' ] } - { role: doraemon, tags: [ 'client-install' ] } + - { role: npm, tags: [ 'client-install' ] } - { role: git-daemon, tags: [ 'client-install' ] } diff --git a/roles/doraemon/defaults/main.yml b/roles/doraemon/defaults/main.yml index 5a684ac..06e259f 100644 --- a/roles/doraemon/defaults/main.yml +++ b/roles/doraemon/defaults/main.yml @@ -1,2 +1,2 @@ --- -doraemon_version: 1.1.1-1 +doraemon_version: 1.2.0-1 diff --git a/roles/nethcfg/tasks/domain_groups.yml b/roles/nethcfg/tasks/domain_groups.yml new file mode 100644 index 0000000..53fe742 --- /dev/null +++ b/roles/nethcfg/tasks/domain_groups.yml @@ -0,0 +1,49 @@ +--- +- name: Verifico la presenza del gruppo Domain Users + shell: /sbin/e-smith/db accounts show domusers + register: check_domusers + sudo: yes + ignore_errors: true + +- name: Creazione gruppo Domain Users + shell: /sbin/e-smith/db accounts set domusers group Description "Domain Users" Members admin Removable no + sudo: yes + when: check_domusers|failed + +- name: Configurazione nuovo gruppo Domain Users + shell: /sbin/e-smith/signal-event group-create domusers + sudo: yes + when: check_domusers|failed + +- name: Verifico la presenza del gruppo Domain Operators + shell: /sbin/e-smith/db accounts show domopers + register: check_domopers + sudo: yes + ignore_errors: true + +- name: Creazione gruppo Domain Operators + shell: /sbin/e-smith/db accounts set domopers group Description "Domain Operators" Removable no + sudo: yes + when: check_domopers|failed + +- name: Configurazione nuovo gruppo Domain Operators + shell: /sbin/e-smith/signal-event group-create domopers + sudo: yes + when: check_domopers|failed + +- name: Verifico la presenza del gruppo Docenti + shell: /sbin/e-smith/db accounts show docenti + register: check_docenti + sudo: yes + ignore_errors: true + +- name: Creazione gruppo Docenti + shell: /sbin/e-smith/db accounts set docenti group Description "Docenti" Removable no + sudo: yes + when: check_docenti|failed + +- name: Configurazione nuovo gruppo Docenti + shell: /sbin/e-smith/signal-event group-create docenti + sudo: yes + when: check_docenti|failed + diff --git a/roles/nethcfg/tasks/main.yml b/roles/nethcfg/tasks/main.yml index 29eed4b..37ad3a9 100644 --- a/roles/nethcfg/tasks/main.yml +++ b/roles/nethcfg/tasks/main.yml @@ -13,3 +13,7 @@ - include: reconfig_srv.yml tags: - nethcfg + +- include: domain_groups.yml + tags: + - domaingroups diff --git a/roles/nethcfg/tasks/reconfig_srv.yml b/roles/nethcfg/tasks/reconfig_srv.yml index 4d184b2..2d2ea7f 100644 --- a/roles/nethcfg/tasks/reconfig_srv.yml +++ b/roles/nethcfg/tasks/reconfig_srv.yml @@ -119,38 +119,6 @@ sudo: yes when: chk_smb|changed -- name: Verifico la presenza del gruppo Domain Users - shell: /sbin/e-smith/db accounts show domusers - register: check_domusers - sudo: yes - ignore_errors: true - -- name: Creazione gruppo Domain Users - shell: /sbin/e-smith/db accounts set domusers group Description "Domain Users" Members admin Removable no - sudo: yes - when: check_domusers|failed - -- name: Configurazione nuovo gruppo Domain Users - shell: /sbin/e-smith/signal-event group-create domusers - sudo: yes - when: check_domusers|failed - -- name: Verifico la presenza del gruppo Domain Operators - shell: /sbin/e-smith/db accounts show domopers - register: check_domopers - sudo: yes - ignore_errors: true - -- name: Creazione gruppo Domain Operators - shell: /sbin/e-smith/db accounts set domopers group Description "Domain Operators" Removable no - sudo: yes - when: check_domopers|failed - -- name: Configurazione nuovo gruppo Domain Operators - shell: /sbin/e-smith/signal-event group-create domopers - sudo: yes - when: check_domopers|failed - - name: Abilito il ricaricamento dei servizi smb su ibay-create file: src="reload" dest="{{ item }}/smb" state=link force=yes with_items: diff --git a/roles/npm/defaults/main.yml b/roles/npm/defaults/main.yml new file mode 100644 index 0000000..9150041 --- /dev/null +++ b/roles/npm/defaults/main.yml @@ -0,0 +1,2 @@ +--- +npm_version: 1.0.0-1 diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml new file mode 100644 index 0000000..432f7c3 --- /dev/null +++ b/roles/npm/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- include: npm.yml + tags: + - npm + - networkpackagemanager diff --git a/roles/npm/tasks/npm.yml b/roles/npm/tasks/npm.yml new file mode 100644 index 0000000..c7a9260 --- /dev/null +++ b/roles/npm/tasks/npm.yml @@ -0,0 +1,16 @@ +--- +- name: Check installazione + versione networkpackagemanager + shell: rpm -q nethserver-networkpackagemanager + ignore_errors: yes + register: check_npm_pkg + changed_when: check_npm_pkg.rc != 0 or check_npm_pkg.stdout.find('{{ npm_version }}') == -1 + +- name: Rimozione versioni precedenti + yum: pkg=nethserver-networkpackagemanager state=absent + sudo: yes + when: check_npm_pkg|changed + +- name: Installazione networkpackagemanager + yum: pkg='http://sys42.eu/downloads/rpm/nethserver-networkpackagemanager-{{ npm_version }}.ns6.noarch.rpm' state=present + when: check_npm_pkg|changed + sudo: yes