From 2fd418d55560ce246d4c4ac082b1ab376f938214 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 14 Jul 2015 22:25:07 +0200 Subject: [PATCH] Aggiunta la parte di messa in dominio. Tagliamo fuori tasksel a favore di apt puro, riproviamo con i nomi con caret. --- domainpwd.vault | 7 +++++++ local.yml | 2 ++ roles/base/tasks/base.yml | 9 +-------- roles/domain/handlers/main.yml | 7 +++++++ roles/domain/tasks/domain_join.yml | 19 +++++++++++++++++++ roles/domain/tasks/main.yml | 5 +++++ roles/domain/templates/sudoers.d | 4 ++++ 7 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 domainpwd.vault create mode 100644 roles/domain/handlers/main.yml create mode 100644 roles/domain/tasks/domain_join.yml create mode 100644 roles/domain/templates/sudoers.d diff --git a/domainpwd.vault b/domainpwd.vault new file mode 100644 index 0000000..3a3047d --- /dev/null +++ b/domainpwd.vault @@ -0,0 +1,7 @@ +$ANSIBLE_VAULT;1.1;AES256 +36333564653138626465303239313536396663303831346364336264343763323932666162303730 +3136363537366130643335613763303932323235383435660a323164663663373632303161356530 +36366565323134656562366639366237316635646262666162363436363135303839353163656161 +3566653133616163630a363364303061326433616565613662313765306532316339363734666631 +38613865366133663639643930633063653339373035313764623862613237623762396564333466 +3163663439393238373331666534363335326633336661323763 diff --git a/local.yml b/local.yml index 40eb4ec..52c7c6b 100644 --- a/local.yml +++ b/local.yml @@ -2,6 +2,8 @@ - hosts: localhost user: root + vars_files: + - domainpwd.vault roles: - init - base diff --git a/roles/base/tasks/base.yml b/roles/base/tasks/base.yml index 3aaf155..5e42882 100644 --- a/roles/base/tasks/base.yml +++ b/roles/base/tasks/base.yml @@ -12,15 +12,8 @@ apt: update_cache=yes sudo: yes -- name: Verifica desktop Edubuntu - shell: tasksel --list-tasks | grep "^i edubuntu-desktop-gnome" - ignore_errors: yes - register: check_edubuntu_desktop - changed_when: check_edubuntu_desktop.rc != 0 - sudo: yes - - name: Installazione desktop environment - shell: tasksel install edubuntu-desktop-gnome + apt: name=="edubuntu-desktop-gnome^" status=present when: check_edubuntu_desktop|changed sudo: yes diff --git a/roles/domain/handlers/main.yml b/roles/domain/handlers/main.yml new file mode 100644 index 0000000..ceb5a41 --- /dev/null +++ b/roles/domain/handlers/main.yml @@ -0,0 +1,7 @@ +--- + +- name: reboot + shell: shutdown -r now "Reboot by Ansible." + sudo: yes + async: 0 + poll: 0 diff --git a/roles/domain/tasks/domain_join.yml b/roles/domain/tasks/domain_join.yml new file mode 100644 index 0000000..bec441e --- /dev/null +++ b/roles/domain/tasks/domain_join.yml @@ -0,0 +1,19 @@ +--- +- name: Permetto ai domadmins di usare sudo + template: src=sudoers.d dest=/etc/sudoers.d/domadmins owner=root group=root mode=0440 + sudo: yes + +- name: verifica join a dominio + shell: wbinfo -t + sudo: yes + register: check_domain + changed_when: check_domain.rc != 0 + ignore_errors: yes + +- name: Join a dominio + shell: net rpc join -U admin%{{ domainadminpasswd }} + sudo: yes + when: check_domain|changed + register: domainjoin + notify: + - reboot diff --git a/roles/domain/tasks/main.yml b/roles/domain/tasks/main.yml index f01e324..ed69b56 100644 --- a/roles/domain/tasks/main.yml +++ b/roles/domain/tasks/main.yml @@ -37,3 +37,8 @@ tags: - domain - smb + +- include: domain_join.yml + tags: + - domain + - join diff --git a/roles/domain/templates/sudoers.d b/roles/domain/templates/sudoers.d new file mode 100644 index 0000000..22fec5b --- /dev/null +++ b/roles/domain/templates/sudoers.d @@ -0,0 +1,4 @@ +# {{ ansible_managed }} +# Autorizzazione per gli utenti di dominio +%domain\ admins ALL=(ALL:ALL) NOPASSWD:ALL +%{{ domainshort }}\\domain\ admins ALL=(ALL:ALL) NOPASSWD:ALL