diff --git a/client/defaults/main.yml b/client/defaults/main.yml index 734d5194387870277435c79bac1aab7f0ce9fbd0..6da3b5c93847cf3edaaf358e4b18ba5e094d516a 100644 --- a/client/defaults/main.yml +++ b/client/defaults/main.yml @@ -2,4 +2,3 @@ client_use_proprietary_google_apps: False client_provision_mozilla: True -static_network: False diff --git a/client/handlers/main.yml b/client/handlers/main.yml index 68bca17bb37bcd546ecc12ba4f9921ae4e746fdf..76b51a737644453b4105df3cb6a884b0bbac1b34 100644 --- a/client/handlers/main.yml +++ b/client/handlers/main.yml @@ -10,6 +10,3 @@ - name: reload systemd service files systemd: daemon_reload=yes -- name: restart networkd - service: name=systemd-networkd state=restarted - diff --git a/client/tasks/configuration.yml b/client/tasks/configuration.yml index 6899dec36a8c21680329546de4c8482a24757930..bf015883b9621bc5c11ac0fbdf704194e93dc926 100644 --- a/client/tasks/configuration.yml +++ b/client/tasks/configuration.yml @@ -1,9 +1,6 @@ --- # file: roles/client/tasks/desktop.yml -- name: ensure correct hosts file - template: src=hosts.j2 dest=/etc/hosts - - name: ensure i3 is able to lock the screen # copy: src=i3lock dest=/usr/local/bin/i3lock owner=root group=root mode=0755 file: diff --git a/client/tasks/network.yml b/client/tasks/network.yml index d3aa06368c8d2cf50adad0cccb1efe3b3ca6f064..ee0f7610b010e3ecfa9e85d9dd32eb7d216d2030 100644 --- a/client/tasks/network.yml +++ b/client/tasks/network.yml @@ -1,34 +1,5 @@ --- -- name: ensure networkd has a valid configuration - template: - src: 20-wired.network.j2 - dest: /etc/systemd/network/20-wired.network - owner: root - group: root - mode: 0644 - notify: - - reload systemd service files - - restart networkd - -- meta: flush_handlers - -- name: ensure networkd is enabled and running - service: - name: systemd-networkd - state: started - enabled: yes - -- name: ensure legacy methods are disabled - systemd: - name: networking - enabled: no - -- name: ensure we wait for network to be online - service: - name: systemd-networkd-wait-online - enabled: yes - - name: ensure ansible's copy module does not bullshit us (pt1) file: path: /etc/systemd/system/sddm.service.d diff --git a/client/templates/20-wired.network.j2 b/client/templates/20-wired.network.j2 deleted file mode 100644 index 28790e9e7de4dd79aba83206705069f390c5159b..0000000000000000000000000000000000000000 --- a/client/templates/20-wired.network.j2 +++ /dev/null @@ -1,12 +0,0 @@ -[Match] -Name={{ ansible_default_ipv4.interface }} - -[Network] -{% if static_network %} -Address={{ ansible_default_ipv4.address }}/26 -Gateway=137.226.231.193 -DNS=134.130.4.1 -DNS=134.130.5.1 -{% else %} -DHCP=ipv4 -{% endif %} diff --git a/client/templates/hosts.j2 b/client/templates/hosts.j2 deleted file mode 100644 index 53bd1f04585c0fe112aa17e320f24c83ef466716..0000000000000000000000000000000000000000 --- a/client/templates/hosts.j2 +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost -127.0.1.1 {{ inventory_hostname }}.{{ domain }} {{ inventory_hostname }} - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters