diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39fd7cc708354ede899fecb30c3fe8b86ed44bb4..1d7709313d783e43047ade4b62dac80073301817 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,4 +5,4 @@ ansible-lint: # Validate ansible configuration stage: validate image: registry.gitlab.com/pipeline-components/ansible-lint:latest script: - - ansible-lint --show-relpath \ No newline at end of file + - ansible-lint --show-relpath diff --git a/playbooks/eduroam.yaml b/playbooks/eduroam.yaml index b3f456b80ac885cc1fc3f64b1905c2a06cca04ff..2f9e14b7ef5dbbf1db3ca4e8ccb310fd7f56448d 100644 --- a/playbooks/eduroam.yaml +++ b/playbooks/eduroam.yaml @@ -10,22 +10,20 @@ msg: "This playbook must be run as your own user account." when: ansible_user_id == "root" - name: Remove existing Eduroam Wi-Fi Network - ansible.builtin.shell: + ansible.builtin.command: cmd: /usr/bin/nmcli connection delete eduroam ignore_errors: true - name: Add Eduroam Wi-Fi Network - ansible.builtin.shell: + ansible.builtin.command: cmd: > - /usr/bin/nmcli connection add con-name eduroam - type wifi - ssid eduroam - connection.permissions {{ ansible_user_id }} - connection.autoconnect-priority -10 - wifi-sec.key-mgmt wpa-eap - 802-1x.eap peap - 802-1x.anonymous-identity "@ebi.ac.uk" - 802-1x.identity "{{ ansible_user_id }}@ebi.ac.uk" - 802-1x.phase2-auth mschapv2 + /usr/bin/nmcli connection add con-name eduroam + type wifi + ssid eduroam + connection.permissions {{ ansible_user_id }} + connection.autoconnect-priority -10 + wifi-sec.key-mgmt wpa-eap + 802-1x.eap peap + 802-1x.anonymous-identity "@ebi.ac.uk" + 802-1x.identity "{{ ansible_user_id }}@ebi.ac.uk" + 802-1x.phase2-auth mschapv2 802-1x.system-ca-certs true - - \ No newline at end of file diff --git a/playbooks/network_reset.yaml b/playbooks/network_reset.yaml index 93e2ca4a79a06a4a1111dcc10a966b6422a80903..05d973b7e44cd20121e6efd88da0a42cc5ddf9ee 100644 --- a/playbooks/network_reset.yaml +++ b/playbooks/network_reset.yaml @@ -3,10 +3,8 @@ - name: Reset Network Services hosts: localhost tasks: - - ansible.builtin.import_tasks: ../tasks/require_sudo.yaml -# - name: Re-apply Netplan Configuration -# ansible.builtin.script: -# cmd: '/usr/sbin/netplan apply' + - name: Import tasks + ansible.builtin.import_tasks: ../tasks/require_sudo.yaml - name: Restart NetworkManager ansible.builtin.service: name: NetworkManager @@ -14,4 +12,4 @@ - name: Restart DNS ansible.builtin.service: name: systemd-resolved - state: restarted \ No newline at end of file + state: restarted diff --git a/tasks/require_sudo.yaml b/tasks/require_sudo.yaml index 6f5ec05d1233bda3429e5b468efa3ebfa36946c2..1dc6d0f20e62ec10d9a2980779b581f1a508da07 100644 --- a/tasks/require_sudo.yaml +++ b/tasks/require_sudo.yaml @@ -1,5 +1,5 @@ --- - - name: Privilege Escalation - ansible.builtin.fail: - msg: "This playbook must be run with elevated permissions. Please re-run with sudo." - when: ansible_user_id != "root" \ No newline at end of file +- name: Privilege Escalation + ansible.builtin.fail: + msg: "This playbook must be run with elevated permissions. Please re-run with sudo." + when: ansible_user_id != "root"