diff --git a/roles/base/tasks/ansible-pull.yml b/roles/base/tasks/ansible-pull.yml index d28a28f..e7212a9 100644 --- a/roles/base/tasks/ansible-pull.yml +++ b/roles/base/tasks/ansible-pull.yml @@ -4,7 +4,7 @@ apt: name: ansible state: present - sudo: yes + become: yes - name: Updating ansible-pull custom scripts get_url: diff --git a/roles/base/tasks/desktop-environment.yml b/roles/base/tasks/desktop-environment.yml index 7b6234d..bbfd0db 100644 --- a/roles/base/tasks/desktop-environment.yml +++ b/roles/base/tasks/desktop-environment.yml @@ -7,13 +7,13 @@ register: check_edubuntu_pkg changed_when: check_edubuntu_pkg.rc != 0 tags: edu-install - sudo: yes + become: yes - name: Installation of the desktop environment shell: "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y install edubuntu-desktop-gnome^" when: check_edubuntu_pkg|changed tags: edu-install - sudo: yes + become: yes - name: Change default desktop environment replace: diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 6d9f6de..a9df955 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -2,44 +2,59 @@ # Management of packages - name: Removing packages commonly not required - apt: pkg={{ item }} state=absent purge=yes + apt: + pkg: '{{ item }}' + state: absent + purge: yes with_items: "{{ base_common_delpkg }}" - sudo: yes + become: yes - name: Removing packages from client machines - apt: pkg={{ item }} state=absent purge=yes + apt: + pkg: '{{ item }}' + state: absent + purge: yes with_items: "{{ base_client_delpkg }}" - sudo: yes + become: yes when: role == 'client' and base_client_delpkg|length > 0 - name: Removing packages from docenti machines - apt: pkg={{ item }} state=absent purge=yes + apt: + pkg: '{{ item }}' + state: absent + purge: yes with_items: "{{ base_docenti_delpkg }}" - sudo: yes + become: yes when: role == 'docenti' and base_docenti_delpkg|length > 0 - name: Cleanup of unneeded packages shell: apt-get -y autoremove register: autoremove changed_when: "'Rimozione' in autoremove.stdout" - sudo: yes + become: yes - name: Installing additional common packages - apt: pkg={{ item }} state=installed + apt: + pkg: '{{ item }}' + state: installed with_items: "{{ base_common_addpkg }}" tags: edu-install - sudo: yes + become: yes - name: Installing additional packages for client role - apt: pkg={{ item }} state=present + apt: + pkg: '{{ item }}' + state: present with_items: "{{ base_client_addpkg }}" - sudo: yes + become: yes when: role == 'client' and base_client_addpkg|length > 0 - name: Installing additional packages for docenti role - apt: pkg={{ item }} state=present + apt: + pkg: '{{ item }}' + state: present with_items: "{{ base_docenti_addpkg }}" - sudo: yes + become: yes when: role == 'docenti' and base_docenti_addpkg|length > 0 - name: Correggo NetworkManager per gestire la rete diff --git a/roles/base/tasks/system-update.yml b/roles/base/tasks/system-update.yml index 2b87fb6..0fb9d16 100644 --- a/roles/base/tasks/system-update.yml +++ b/roles/base/tasks/system-update.yml @@ -2,9 +2,12 @@ # Manage system upgrade - name: Updating available packages - apt: update_cache=yes cache_valid_time=180 - sudo: yes + apt: + update_cache: yes + cache_valid_time: 180 + become: yes - name: Upgrading system - apt: upgrade=full - sudo: yes + apt: + upgrade: full + become: yes diff --git a/roles/base/tasks/virtualbox-guest-addons.yml b/roles/base/tasks/virtualbox-guest-addons.yml index a8a7ed0..a6d2dac 100644 --- a/roles/base/tasks/virtualbox-guest-addons.yml +++ b/roles/base/tasks/virtualbox-guest-addons.yml @@ -2,6 +2,8 @@ # Manage Virtualbox additions - name: Adding Virtualbox Guest Additions if required - apt: pkg=virtualbox-guest-dkms state=present + apt: + pkg: virtualbox-guest-dkms + stat: present when: ansible_product_name == "VirtualBox" - sudo: yes + become: yes diff --git a/roles/client/handlers/main.yml b/roles/client/handlers/main.yml index ceb5a41..574e753 100644 --- a/roles/client/handlers/main.yml +++ b/roles/client/handlers/main.yml @@ -2,6 +2,6 @@ - name: reboot shell: shutdown -r now "Reboot by Ansible." - sudo: yes + become: yes async: 0 poll: 0 diff --git a/roles/client/tasks/epoptes.yml b/roles/client/tasks/epoptes.yml index 995bee6..49e1397 100644 --- a/roles/client/tasks/epoptes.yml +++ b/roles/client/tasks/epoptes.yml @@ -35,7 +35,7 @@ - name: Getting the epoptes server certificate shell: /usr/sbin/epoptes-client -c - sudo: yes + become: yes when: crt_epo_exists|failed # I don't notify anymore, hoping that this would be done on first run after # preseed and it should restart because of domain join. diff --git a/roles/custom/tasks/custom.yml b/roles/custom/tasks/custom.yml index a22bc6f..964130f 100644 --- a/roles/custom/tasks/custom.yml +++ b/roles/custom/tasks/custom.yml @@ -5,11 +5,11 @@ name: plymouth-theme-edubuntu-bglug state: present force: yes - sudo: yes + become: yes - name: Installing lightdm wallpaper apt: name: bglug-artwork state: present force: yes - sudo: yes + become: yes diff --git a/roles/custom/tasks/unattended-upgrades.yml b/roles/custom/tasks/unattended-upgrades.yml index 018cf24..96c28cf 100644 --- a/roles/custom/tasks/unattended-upgrades.yml +++ b/roles/custom/tasks/unattended-upgrades.yml @@ -4,7 +4,7 @@ apt: name: "{{ item }}" state: present - sudo: yes + become: yes with_items: - unattended-upgrades - update-notifier-common diff --git a/roles/docenti/tasks/epoptes.yml b/roles/docenti/tasks/epoptes.yml index 658e8b4..2155720 100644 --- a/roles/docenti/tasks/epoptes.yml +++ b/roles/docenti/tasks/epoptes.yml @@ -9,7 +9,7 @@ - name: Disabling sysv start shell: update-rc.d -f epoptes remove - sudo: yes + become: yes - name: Installing upstart service copy: @@ -23,4 +23,4 @@ service: name: epoptes state: started - sudo: yes + become: yes diff --git a/roles/domain/handlers/main.yml b/roles/domain/handlers/main.yml index ceb5a41..574e753 100644 --- a/roles/domain/handlers/main.yml +++ b/roles/domain/handlers/main.yml @@ -2,6 +2,6 @@ - name: reboot shell: shutdown -r now "Reboot by Ansible." - sudo: yes + become: yes async: 0 poll: 0 diff --git a/roles/domain/tasks/audio.yml b/roles/domain/tasks/audio.yml index 35c5789..d2a8156 100644 --- a/roles/domain/tasks/audio.yml +++ b/roles/domain/tasks/audio.yml @@ -11,7 +11,7 @@ service: name: pulseaudio state: started - sudo: yes + become: yes - name: "Configuring client options" lineinfile: @@ -24,7 +24,7 @@ - name: Disabling pulseaudio startup on lightdm shell: chmod -x /usr/bin/start-pulseaudio-x11 - sudo: yes + become: yes - name: Adding pulseaudio fixing script at reboot. lineinfile: diff --git a/roles/domain/tasks/domain_join.yml b/roles/domain/tasks/domain_join.yml index 02ad97b..8b8c35a 100644 --- a/roles/domain/tasks/domain_join.yml +++ b/roles/domain/tasks/domain_join.yml @@ -3,14 +3,14 @@ - name: Checking domain join shell: wbinfo -t - sudo: yes + become: yes register: check_domain changed_when: check_domain.rc != 0 ignore_errors: yes - name: Joining domain - shell: net rpc join -U admin%{{ domainadminpasswd }} - sudo: yes + shell: 'net rpc join -U admin%{{ domainadminpasswd }}' + become: yes when: check_domain|changed register: domainjoin notify: diff --git a/roles/domain/tasks/glib2.yml b/roles/domain/tasks/glib2.yml index 62b9521..9ba8793 100644 --- a/roles/domain/tasks/glib2.yml +++ b/roles/domain/tasks/glib2.yml @@ -24,5 +24,5 @@ - name: Recompiling glib2 schemas shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/ - sudo: yes + become: yes when: cfg_glib_users|changed or cfg_glib_mounted|changed or cfg_keyb_layout|changed diff --git a/roles/domain/tasks/main.yml b/roles/domain/tasks/main.yml index 0818381..0ff1110 100644 --- a/roles/domain/tasks/main.yml +++ b/roles/domain/tasks/main.yml @@ -54,4 +54,4 @@ - name: Updating local version for repo shell: 'rm -f {{ ansible_local.checksum.repover_file }} && echo "{{ ansible_local.checksum.repover }}" > {{ ansible_local.checksum.repover_file }}' - sudo: yes + become: yes diff --git a/roles/domain/tasks/ntp.yml b/roles/domain/tasks/ntp.yml index 94f8c45..da09d81 100644 --- a/roles/domain/tasks/ntp.yml +++ b/roles/domain/tasks/ntp.yml @@ -5,7 +5,7 @@ apt: name: ntp state: present - sudo: yes + become: yes - name: Configuring NTP template: @@ -27,5 +27,5 @@ - name: Restarting NTP service shell: service ntp restart - sudo: yes + become: yes when: cfg_ntp|changed diff --git a/roles/domain/tasks/pam_base.yml b/roles/domain/tasks/pam_base.yml index b6e89b7..c26cb0d 100644 --- a/roles/domain/tasks/pam_base.yml +++ b/roles/domain/tasks/pam_base.yml @@ -5,7 +5,7 @@ apt: name: libpam-winbind state: present - sudo: yes + become: yes # Leaving them here commented, as they may be needed in the future # for improvements on login times. @@ -17,14 +17,14 @@ # dest: /etc/pam.d/common-auth # regexp: '^.*pam_unix\.so.*nullok_secure$' # replace: 'auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass' -# sudo: yes +# become: yes # #- name: 'common-auth: rimuovo config auto pam_winbind' # lineinfile: # dest: /etc/pam.d/common-auth # regexp: 'pam_winbind\.so krb5' # state: absent -# sudo: yes +# become: yes # #- name: 'common-auth: aggiunta pam_winbind' # lineinfile: @@ -33,7 +33,7 @@ # insertbefore: '^auth.*pam_unix\.so' # line: 'auth [success=2 default=ignore] pam_winbind.so' # state: present -# sudo: yes +# become: yes ## common-password # @@ -43,7 +43,7 @@ # regexp: '^(password.*pam_unix\.so.*sha512)$' # replace: '\1 min=4 max=20' # backup: yes -# sudo: yes +# become: yes # ## common-session # @@ -55,4 +55,4 @@ # line: 'session required pam_mkhomedir.so umask=0022 skel=/etc/skel silent' # state: present # backup: yes -# sudo: yes +# become: yes diff --git a/roles/domain/tasks/pam_mount.yml b/roles/domain/tasks/pam_mount.yml index 2e5bc94..48771e4 100644 --- a/roles/domain/tasks/pam_mount.yml +++ b/roles/domain/tasks/pam_mount.yml @@ -5,7 +5,7 @@ apt: name: libpam-mount state: present - sudo: yes + become: yes - name: Configuring pam_mount template: diff --git a/roles/domain/tasks/pkgs.yml b/roles/domain/tasks/pkgs.yml index a908dee..e00ceea 100644 --- a/roles/domain/tasks/pkgs.yml +++ b/roles/domain/tasks/pkgs.yml @@ -5,7 +5,7 @@ apt: pkg: '{{ item }}' state: present - sudo: yes + become: yes with_items: - winbind - samba diff --git a/roles/domain/tasks/policykit-1.yml b/roles/domain/tasks/policykit-1.yml index c4cdb91..ef51f58 100644 --- a/roles/domain/tasks/policykit-1.yml +++ b/roles/domain/tasks/policykit-1.yml @@ -8,4 +8,4 @@ group: root mode: 0644 backup: yes - sudo: yes + become: yes diff --git a/roles/domain/tasks/smb_config.yml b/roles/domain/tasks/smb_config.yml index b35780b..56b2b17 100644 --- a/roles/domain/tasks/smb_config.yml +++ b/roles/domain/tasks/smb_config.yml @@ -17,12 +17,12 @@ - name: SAMBA restart shell: restart smbd - sudo: yes + become: yes when: cfg_samba|changed - name: Winbind restart shell: restart winbind - sudo: yes + become: yes when: cfg_samba|changed - name: Creating home base diff --git a/roles/domain/tasks/sslproxy.yml b/roles/domain/tasks/sslproxy.yml index 1576630..df5ba79 100644 --- a/roles/domain/tasks/sslproxy.yml +++ b/roles/domain/tasks/sslproxy.yml @@ -19,7 +19,7 @@ - name: Adding certificate sto the ones used by the system shell: update-ca-certificates when: proxycrt_dwnl|changed - sudo: yes + become: yes - name: Firefox settings to include certificate get_url: diff --git a/roles/networkpackagemanager/tasks/main.yml b/roles/networkpackagemanager/tasks/main.yml index e16b63e..b1bc68f 100644 --- a/roles/networkpackagemanager/tasks/main.yml +++ b/roles/networkpackagemanager/tasks/main.yml @@ -9,7 +9,7 @@ apt: name: '{{ item }}' state: present - sudo: yes + become: yes with_items: "{{ addpkg }}" when: addpkg|join(' ')|trim != '' @@ -23,4 +23,4 @@ - name: Updating local hash for packages shell: 'rm -f {{ ansible_local.checksum.pkgver_file }} && echo "{{ ansible_local.checksum.pkgver }}" > {{ ansible_local.checksum.pkgver_file }}' - sudo: yes + become: yes diff --git a/roles/vagrantbox/tasks/vagrantbox.yml b/roles/vagrantbox/tasks/vagrantbox.yml index 97af71f..30b4ca7 100644 --- a/roles/vagrantbox/tasks/vagrantbox.yml +++ b/roles/vagrantbox/tasks/vagrantbox.yml @@ -9,7 +9,7 @@ shell: /bin/bash state: present generate_ssh_key: yes - sudo: yes + become: yes - name: Concessione diritti sudo all'utente vagrant lineinfile: @@ -22,19 +22,19 @@ create: yes state: present validate: '/usr/sbin/visudo -cf %s' - sudo: yes + become: yes - name: Autorizzo chiave pubblica insicura per vagrant authorized_key: user: vagrant key: "http://sys42.eu/downloads/vagrant.pub" - sudo: yes + become: yes - name: Autorizzo chiave pubblica di amgmt del server authorized_key: user: vagrant key: "{{ 'http://' + ansible_local.domain.serverfqdn + ':3000/mgmtkey' }}" - sudo: yes + become: yes - name: Utilizzo il task di cleanup della box, prima di spegnere shell: curl -s http://sys42.eu/downloads/box-cleanup.sh | sudo bash