Compare commits

...

16 Commits

Author SHA1 Message Date
d0c5109586 Fixing the possibility to disable network interfaces from NM: do not presume eth0 is the network interface. 2019-11-20 00:51:41 +01:00
b40ddd873b Other updates to role to cope with warnings in newer Ansible versions. 2019-11-19 00:10:53 +01:00
099af70925 Update roles for warnings in newer version of Ansible. 2019-11-18 23:47:10 +01:00
e45c72de4d Updating roles for recent versions of Ansible. 2019-11-18 23:06:25 +01:00
c5dbaf38e1 Fixing the client side as per paperms-fix server-config branch. 2018-11-11 14:09:37 +01:00
cf30fbe2e6 Should fix issue #1. 2018-11-11 14:09:02 +01:00
36ca2d681a Should fix issue #2. 2018-11-11 14:08:57 +01:00
f7b222e499 Removing old unused stuff. 2018-11-11 14:08:43 +01:00
8112fd3866 Adding base role to domain. 2018-11-11 13:06:14 +00:00
2be2790e52 Should fix issue #1. 2018-11-11 13:06:14 +00:00
959846ae46 Should fix issue #2. 2018-11-11 13:06:14 +00:00
ed5010fe9a Removing old unused stuff. 2018-11-11 13:06:14 +00:00
0626b20e85 Adding local signed fixes. 2018-11-08 22:55:41 +01:00
156a3b5c01
Preventing breakage for epoptes package missing. Disabling ufw on docente as per issue #12. (#16) 2017-12-13 00:17:21 +01:00
f12da6547d
Ensuring epoptes-client is installed before modifying its files. (#15)
* Ensuring epoptes-client is installed before touching its files.
2017-12-12 23:51:25 +01:00
57c5e8051c Re-enabling audio fix. (#13) 2017-10-06 02:48:38 +02:00
23 changed files with 166 additions and 58 deletions

View File

@ -7,6 +7,7 @@ base_common_addpkg:
- firefox-locale-it - firefox-locale-it
- libreoffice-l10n-it - libreoffice-l10n-it
- libnss-myhostname - libnss-myhostname
- ubuntu-restricted-extras
base_common_delpkg: base_common_delpkg:
- libnss-mdns - libnss-mdns
- unity-webapps-common - unity-webapps-common

View File

@ -10,7 +10,7 @@
- name: Installation of the desktop environment - name: Installation of the desktop environment
shell: "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y install edubuntu-desktop-gnome^" shell: "DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y install edubuntu-desktop-gnome^"
when: check_edubuntu_pkg|changed when: check_edubuntu_pkg is changed
tags: edu-install tags: edu-install
- name: Change default desktop environment - name: Change default desktop environment

View File

@ -27,11 +27,6 @@
- pkgs - pkgs
- packages - packages
#- include: audio.yml
# tags:
# - base
# - audio
- include: system.yml - include: system.yml
tags: tags:
- base - base

View File

@ -1,51 +1,59 @@
--- ---
# Management of packages # Management of packages
- name: Activate LTS support by the means of HWE stack
apt:
name:
- linux-generic-lts-xenial
- xserver-xorg-core-lts-xenial
- xserver-xorg-lts-xenial
- xserver-xorg-video-all-lts-xenial
- xserver-xorg-input-all-lts-xenial
- libwayland-egl1-mesa-lts-xenial
state: present
install_recommends: yes
- name: Removing packages commonly not required - name: Removing packages commonly not required
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_common_delpkg }}"
state: absent state: absent
purge: yes purge: yes
with_items: "{{ base_common_delpkg }}"
- name: Removing packages from client machines - name: Removing packages from client machines
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_client_delpkg }}"
state: absent state: absent
purge: yes purge: yes
with_items: "{{ base_client_delpkg }}"
when: ansible_local.noderole.role == 'client' and base_client_delpkg|length > 0 when: ansible_local.noderole.role == 'client' and base_client_delpkg|length > 0
- name: Removing packages from docenti machines - name: Removing packages from docenti machines
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_docenti_delpkg }}"
state: absent state: absent
purge: yes purge: yes
with_items: "{{ base_docenti_delpkg }}"
when: ansible_local.noderole.role == 'docenti' and base_docenti_delpkg|length > 0 when: ansible_local.noderole.role == 'docenti' and base_docenti_delpkg|length > 0
- name: Cleanup of unneeded packages - name: Cleanup of unneeded packages
shell: apt-get -y autoremove shell: apt-get -y autoremove
args:
warn: false
register: autoremove register: autoremove
changed_when: "'Rimozione' in autoremove.stdout" changed_when: "'Rimozione' in autoremove.stdout"
- name: Installing additional common packages - name: Installing additional common packages
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_common_addpkg }}"
state: installed state: present
with_items: "{{ base_common_addpkg }}"
tags: edu-install tags: edu-install
- name: Installing additional packages for client role - name: Installing additional packages for client role
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_client_addpkg }}"
state: present state: present
with_items: "{{ base_client_addpkg }}"
when: ansible_local.noderole.role == 'client' and base_client_addpkg|length > 0 when: ansible_local.noderole.role == 'client' and base_client_addpkg|length > 0
- name: Installing additional packages for docenti role - name: Installing additional packages for docenti role
apt: apt:
pkg: '{{ item }}' pkg: "{{ base_docenti_addpkg }}"
state: present state: present
with_items: "{{ base_docenti_addpkg }}"
when: ansible_local.noderole.role == 'docenti' and base_docenti_addpkg|length > 0 when: ansible_local.noderole.role == 'docenti' and base_docenti_addpkg|length > 0

View File

@ -10,21 +10,27 @@
- name: Checking for a correct name - name: Checking for a correct name
shell: cat /tmp/epoptes-srv shell: cat /tmp/epoptes-srv
register: epo_srv_name register: epo_srv_name
when: get_epo_srv_name|changed when: get_epo_srv_name is changed
changed_when: "'none' not in epo_srv_name.stdout" changed_when: "'none' not in epo_srv_name.stdout"
- name: Cleanup - name: Cleanup
file: file:
path: /tmp/epoptes-srv path: /tmp/epoptes-srv
state: absent state: absent
when: get_epo_srv_name|changed when: get_epo_srv_name is changed
- name: Ensuring epoptes-client is installed
apt:
name: epoptes-client
state: present
when: get_epo_srv_name is changed
- name: Configuring the client - name: Configuring the client
replace: replace:
dest: /etc/default/epoptes-client dest: /etc/default/epoptes-client
regexp: "^#SERVER=server" regexp: "^#SERVER=server"
replace: "SERVER={{ epo_srv_name.stdout }}" replace: "SERVER={{ epo_srv_name.stdout }}"
when: epo_srv_name|changed when: epo_srv_name is changed
- name: Checking for an already existent certificate - name: Checking for an already existent certificate
file: file:
@ -35,7 +41,7 @@
- name: Getting the epoptes server certificate - name: Getting the epoptes server certificate
shell: /usr/sbin/epoptes-client -c shell: /usr/sbin/epoptes-client -c
when: crt_epo_exists|failed when: crt_epo_exists is failed
# I don't notify anymore, hoping that this would be done on first run after # I don't notify anymore, hoping that this would be done on first run after
# preseed and it should restart because of domain join. # preseed and it should restart because of domain join.
#notify: #notify:

View File

@ -2,11 +2,10 @@
- name: Ensure needed packages are installed - name: Ensure needed packages are installed
apt: apt:
name: "{{ item }}" name:
- unattended-upgrades
- update-notifier-common
state: present state: present
with_items:
- unattended-upgrades
- update-notifier-common
- name: Configuring unattended upgrades from file - name: Configuring unattended upgrades from file
copy: copy:

View File

@ -1,6 +1,11 @@
--- ---
# Managing Epoptes installation on 'docenti' role. # Managing Epoptes installation on 'docenti' role.
- name: Ensuring epoptes package has been installed
apt:
name: epoptes
state: present
- name: Configuring the Epoptes server - name: Configuring the Epoptes server
lineinfile: lineinfile:
dest: /etc/default/epoptes dest: /etc/default/epoptes
@ -29,3 +34,19 @@
- name: Starting epoptes from upstart - name: Starting epoptes from upstart
shell: /sbin/start epoptes shell: /sbin/start epoptes
when: epoptes_status.stdout.find("start/running") == -1 when: epoptes_status.stdout.find("start/running") == -1
# Disabling ufw as per issue #12
- name: Disabling ufw by override
lineinfile:
path: /etc/init/ufw.override
line: "manual"
state: present
create: yes
owner: root
group: root
mode: 0644
- name: Stopping ufw
service:
name: ufw
state: stopped

View File

@ -1,4 +1,5 @@
--- ---
dependencies: dependencies:
- { role: base }
- { role: client } - { role: client }
- { role: docenti } - { role: docenti }

View File

@ -28,10 +28,18 @@
- name: Disabling pulseaudio startup on lightdm - name: Disabling pulseaudio startup on lightdm
shell: chmod -x /usr/bin/start-pulseaudio-x11 shell: chmod -x /usr/bin/start-pulseaudio-x11
args:
warn: false
#- name: Adding pulseaudio fixing script at reboot. - name: Removing old (and not-working) approach
# lineinfile: file:
# line: '@reboot root curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/pulseaudio-perms.sh | bash >/dev/null 2>&1' path: /etc/cron.d/pulseaudio-perms
# dest: /etc/cron.d/pulseaudio-perms state: absent
# create: yes
# state: present - name: Get the new script
get_url:
url: "http://{{ ansible_local.domain.serverfqdn }}/ks/paperms/paperms.sh"
dest: /tmp/paperms.sh
- name: Run the script (install other support files and fixes the permissions)
shell: bash /tmp/paperms.sh

View File

@ -7,3 +7,5 @@
# Correctly managing ansible-pull runs. # Correctly managing ansible-pull runs.
- name: Updating local version for repo - name: Updating local version for repo
shell: 'rm -f {{ ansible_local.checksum.repover_file }} && echo "{{ ansible_local.checksum.repover }}" > {{ ansible_local.checksum.repover_file }}' shell: 'rm -f {{ ansible_local.checksum.repover_file }} && echo "{{ ansible_local.checksum.repover }}" > {{ ansible_local.checksum.repover_file }}'
args:
warn: false

View File

@ -9,7 +9,7 @@
- name: Joining domain - name: Joining domain
shell: 'net rpc join -U admin%{{ domainadminpasswd }}' shell: 'net rpc join -U admin%{{ domainadminpasswd }}'
when: check_domain|changed when: check_domain is changed
register: domainjoin register: domainjoin
notify: notify:
- reboot - reboot

View File

@ -24,4 +24,4 @@
- name: Recompiling glib2 schemas - name: Recompiling glib2 schemas
shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/ shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/
when: cfg_glib_users|changed or cfg_glib_mounted|changed or cfg_keyb_layout|changed when: cfg_glib_users is changed or cfg_glib_mounted is changed or cfg_keyb_layout is changed

View File

@ -1,5 +1,7 @@
--- ---
# Fixing NetworkManager issues. # Since students are disabling deliberately the network interface from
# NetworkManager, we insert the default interface in /etc/network/interfaces
# so they are not available to NM
- name: Ensuring first NIC will never be disabled again - name: Ensuring first NIC will never be disabled again
lineinfile: lineinfile:
@ -9,10 +11,10 @@
insertafter: EOF insertafter: EOF
with_items: with_items:
- " " - " "
- "auto eth0" - "auto {{ ansible_default_ipv4.interface }}"
- "iface eth0 inet dhcp" - "iface {{ ansible_default_ipv4.interface }} inet dhcp"
# Hiding icon for any sessions # Hiding NetworkManager icon from any sessions
- name: Disabling NetworkManager from popping up in sessions - name: Disabling NetworkManager from popping up in sessions
shell: mv /etc/xdg/autostart/nm-applet.desktop /etc/xdg/autostart/nm-applet.desktop.disabled shell: mv /etc/xdg/autostart/nm-applet.desktop /etc/xdg/autostart/nm-applet.desktop.disabled

View File

@ -26,4 +26,4 @@
- name: Restarting NTP service - name: Restarting NTP service
shell: service ntp restart shell: service ntp restart
when: cfg_ntp|changed when: cfg_ntp is changed

View File

@ -20,7 +20,7 @@
#- name: Downgrading SAMBA if not the right version #- name: Downgrading SAMBA if not the right version
# shell: "/var/lib/{{ ansible_local.domain.domainfull }}/bin/downgrade_samba.sh" # shell: "/var/lib/{{ ansible_local.domain.domainfull }}/bin/downgrade_samba.sh"
# when: check_samba_version|changed # when: check_samba_version is changed
# #
#- name: Checking again for the correct SAMBA version #- name: Checking again for the correct SAMBA version
# shell: dpkg -l | grep libsmbclient # shell: dpkg -l | grep libsmbclient
@ -29,8 +29,7 @@
- name: Installing domain packages - name: Installing domain packages
apt: apt:
pkg: '{{ item }}' pkg:
- winbind
- samba
state: present state: present
with_items:
- winbind
- samba

View File

@ -17,11 +17,11 @@
- name: SAMBA restart - name: SAMBA restart
shell: /sbin/restart smbd shell: /sbin/restart smbd
when: cfg_samba|changed when: cfg_samba is changed
- name: Winbind restart - name: Winbind restart
shell: /sbin/restart winbind shell: /sbin/restart winbind
when: cfg_samba|changed when: cfg_samba is changed
- name: Creating home base - name: Creating home base
file: file:

View File

@ -18,7 +18,7 @@
- name: Adding certificates to the ones used by the system - name: Adding certificates to the ones used by the system
shell: update-ca-certificates shell: update-ca-certificates
when: proxycrt_dwnl|changed when: proxycrt_dwnl is changed
- name: Firefox settings to include certificate - name: Firefox settings to include certificate
get_url: get_url:

View File

@ -45,6 +45,4 @@ post-start script
chown pulse:pulse-access /var/run/pulse/.pulse-cookie chown pulse:pulse-access /var/run/pulse/.pulse-cookie
chmod 640 /var/run/pulse/.pulse-cookie chmod 640 /var/run/pulse/.pulse-cookie
fi fi
# Run script to fix permissions on the pulseaudio stack
/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/pulseaudio-perms.sh | /bin/bash >/dev/null 2>&1 &
end script end script

View File

@ -7,18 +7,18 @@
- name: Installing packages for specific role from NetworkPackageManager - name: Installing packages for specific role from NetworkPackageManager
apt: apt:
name: '{{ item }}' name: "{{ ansible_local.noderole.addpkg }}"
state: present state: present
with_items: "{{ ansible_local.noderole.addpkg }}"
when: ansible_local.noderole.addpkg is defined and ansible_local.noderole.addpkg|join(' ')|trim != '' when: ansible_local.noderole.addpkg is defined and ansible_local.noderole.addpkg|join(' ')|trim != ''
- name: Removing packages for specific role from NetworkPackageManager - name: Removing packages for specific role from NetworkPackageManager
apt: apt:
name: '{{ item }}' name: "{{ ansible_local.noderole.delpkg }}"
state: absent state: absent
purge: yes purge: yes
with_items: "{{ ansible_local.noderole.delpkg }}"
when: ansible_local.noderole.delpkg is defined and ansible_local.noderole.delpkg|join(' ')|trim != '' when: ansible_local.noderole.delpkg is defined and ansible_local.noderole.delpkg|join(' ')|trim != ''
- name: Updating local hash for packages - name: Updating local hash for packages
shell: 'rm -f {{ ansible_local.checksum.pkgver_file }} && echo "{{ ansible_local.checksum.pkgver }}" > {{ ansible_local.checksum.pkgver_file }}' shell: 'rm -f {{ ansible_local.checksum.pkgver_file }} && echo "{{ ansible_local.checksum.pkgver }}" > {{ ansible_local.checksum.pkgver_file }}'
args:
warn: false

View File

@ -0,0 +1,42 @@
#!/bin/bash
# Define a fix name. This will be used to check if the fix was already
# applied.
name=samba-downgrade_20161124.sh
# If already applied, skip
if [[ -f "/var/lib/topolin.ia/fixes/${name}.done" ]]; then
echo "Already fixed with ${name}. Skipping."
exit 0
fi
# Make the required modifications.
export DEBIAN_FRONTEND=noninteractive
apt-get install -q -y --force-yes \
-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
libsmbclient=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
python-samba=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba-common=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba-common-bin=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba-dsdb-modules=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba-libs=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
samba-vfs-modules=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
smbclient=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
libnss-winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
libpam-winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
libwbclient0=2:4.3.11+dfsg-0ubuntu0.14.04.1 \
winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1
pkglist="libsmbclient python-samba samba-common samba-common-bin samba-dsdb-modules samba-libs samba-vfs-modules smbclient libnss-winbind libpam-winbind libwbclient0"
for pkg in ${pkglist}; do
apt-mark auto ${pkg}
apt-mark hold ${pkg}
done
# Once modified the system, ensure to create a check file to skip and not run
# it again if not needed.
mkdir -p /var/lib/topolin.ia/fixes
echo "$(date --iso | tr -d '-')" > /var/lib/topolin.ia/fixes/${name}.done

View File

@ -0,0 +1,20 @@
---
# Permits to apply per-site signed fixes automatically
#
# Prepare a script file, then crypt it with the Domain Administrator password:
# gpg -r info@bglug.it --symmetric --encrypt script.sh > script.sh.gpg
#
# Put the script within the server directory /var/lib/nethserver/ibay/ks/fixes
#
# List the file within domain.yml:
# apply_fixes:
# - script.sh.gpg
#
# Please see roles/prereq/files/samba-downgrade_20161124.sh as a template.
#
- name: Applying local signed fixes
shell: "/usr/bin/curl -sSL http://{{ ansible_local.domain.serverfqdn }}/ks/fixes/{{ item }} | /usr/bin/gpg --passphrase {{ domainadminpasswd }} --decrypt | sudo /bin/bash"
args:
warn: false
with_items: "{{ ansible_local.domain.apply_fixes|default([]) }}"

View File

@ -10,3 +10,9 @@
tags: tags:
- prereq - prereq
- repos - repos
- include: fixes.yml
tags:
- prereq
- fixes
when: ansible_local.domain.apply_fixes is defined

View File

@ -15,7 +15,7 @@
- name: Installing libreoffice PPA GPG key - name: Installing libreoffice PPA GPG key
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 1378B444 shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 1378B444
when: check_gpg_libreoffice|failed when: check_gpg_libreoffice is failed
- name: Checking for ansible PPA GPG key - name: Checking for ansible PPA GPG key
shell: apt-key list | grep -q 7BB9C367 shell: apt-key list | grep -q 7BB9C367
@ -24,7 +24,7 @@
- name: Installing ansible PPA GPG key - name: Installing ansible PPA GPG key
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 7BB9C367 shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 7BB9C367
when: check_gpg_ansible|failed when: check_gpg_ansible is failed
- name: Checking for epoptes PPA GPG key - name: Checking for epoptes PPA GPG key
shell: apt-key list | grep -q 0350B375 shell: apt-key list | grep -q 0350B375
@ -33,7 +33,7 @@
- name: Installing epoptes PPA GPG key - name: Installing epoptes PPA GPG key
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 0350B375 shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 0350B375
when: check_gpg_epoptes|failed when: check_gpg_epoptes is failed
- name: Checking for geogebra GPG key - name: Checking for geogebra GPG key
shell: apt-key list | grep -q 83A736CF shell: apt-key list | grep -q 83A736CF
@ -42,7 +42,7 @@
- name: Installing geogebra GPG key - name: Installing geogebra GPG key
shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 83A736CF shell: apt-key adv --keyserver keyserver.ubuntu.com --recv 83A736CF
when: check_gpg_geogebra|failed when: check_gpg_geogebra is failed
- name: Removing old repositories (if present) - name: Removing old repositories (if present)
file: file: