From 7b65fecfc2e0e6cb5d63d1bb94e5dd7ff2f8200d Mon Sep 17 00:00:00 2001 From: Pig Monkey Date: Mon, 18 Jan 2016 22:04:33 -0800 Subject: [PATCH] create networkmanager role --- playbook.yml | 1 + roles/backup/meta/main.yml | 1 + roles/chat/meta/main.yml | 3 +- roles/git-annex/meta/main.yml | 2 +- roles/mail/meta/main.yml | 3 +- roles/network/tasks/main.yml | 33 ------------------- .../files/toggle_units.sh | 0 .../files/trust_dispatcher.sh | 0 roles/networkmanager/tasks/main.yml | 27 +++++++++++++++ .../templates/trusted_networks.j2 | 0 10 files changed, 32 insertions(+), 38 deletions(-) rename roles/{network => networkmanager}/files/toggle_units.sh (100%) rename roles/{network => networkmanager}/files/trust_dispatcher.sh (100%) create mode 100644 roles/networkmanager/tasks/main.yml rename roles/{network => networkmanager}/templates/trusted_networks.j2 (100%) diff --git a/playbook.yml b/playbook.yml index 30820e0..0132e21 100644 --- a/playbook.yml +++ b/playbook.yml @@ -7,6 +7,7 @@ - { role: x, tags: ['x'] } - { role: i3, tags: ['i3'] } - { role: network, tags: ['network'] } + - { role: networkmanager, tags: ['networkmanager'] } - { role: ntp, tags: ['ntp'] } - { role: firejail, tags: ['firejail'] } - { role: unbound, tags: ['unbound'] } diff --git a/roles/backup/meta/main.yml b/roles/backup/meta/main.yml index 92df020..fac1718 100644 --- a/roles/backup/meta/main.yml +++ b/roles/backup/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - { role: virtualenv } + - { role: networkmanager } diff --git a/roles/chat/meta/main.yml b/roles/chat/meta/main.yml index 998b45f..eb76ade 100644 --- a/roles/chat/meta/main.yml +++ b/roles/chat/meta/main.yml @@ -1,4 +1,3 @@ --- dependencies: - - { role: base } - - { role: network } + - { role: networkmanager } diff --git a/roles/git-annex/meta/main.yml b/roles/git-annex/meta/main.yml index 72123d9..eb76ade 100644 --- a/roles/git-annex/meta/main.yml +++ b/roles/git-annex/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - { role: base } + - { role: networkmanager } diff --git a/roles/mail/meta/main.yml b/roles/mail/meta/main.yml index 998b45f..eb76ade 100644 --- a/roles/mail/meta/main.yml +++ b/roles/mail/meta/main.yml @@ -1,4 +1,3 @@ --- dependencies: - - { role: base } - - { role: network } + - { role: networkmanager } diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 4060ac2..5d2b1ab 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -1,16 +1,4 @@ --- -- name: Push trusted network list - template: src=trusted_networks.j2 dest=/usr/local/etc/trusted_networks - -- name: Verify trusted unit list exists - file: path=/usr/local/etc/trusted_units state=touch - -- name: Push trusted unit toggler - copy: src=toggle_units.sh dest=/usr/local/bin/toggle_units mode=0755 - -- name: Push network trust dispatcher - copy: src=trust_dispatcher.sh dest=/etc/NetworkManager/dispatcher.d/10trust mode=0755 - - name: Install OpenVPN pacman: name=openvpn state=present @@ -32,31 +20,10 @@ - name: Install lftp pacman: name=lftp state=present -- name: Install NetworkManager - pacman: name=networkmanager state=present - -- name: Install NetworkManager OpenVPN plugin - pacman: name=networkmanager-openvpn state=present - -- name: Install NetworkManager applet - pacman: name=network-manager-applet state=present - -- name: Install Xfce notification daemon - pacman: name=xfce4-notifyd state=present - -- name: Install GNOME Keyring - pacman: name=gnome-keyring state=present - - name: Install pdsh aur: name=pdsh user={{ user.name }} tags: - aur -- name: Enable and start NetworkManager - service: name=NetworkManager.service enabled=yes state=started - -- name: Enable and start NetworkManager dispatcher - service: name=NetworkManager-dispatcher.service enabled=yes state=started - - include: firewall.yml - include: macchiato.yml diff --git a/roles/network/files/toggle_units.sh b/roles/networkmanager/files/toggle_units.sh similarity index 100% rename from roles/network/files/toggle_units.sh rename to roles/networkmanager/files/toggle_units.sh diff --git a/roles/network/files/trust_dispatcher.sh b/roles/networkmanager/files/trust_dispatcher.sh similarity index 100% rename from roles/network/files/trust_dispatcher.sh rename to roles/networkmanager/files/trust_dispatcher.sh diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml new file mode 100644 index 0000000..9be6adc --- /dev/null +++ b/roles/networkmanager/tasks/main.yml @@ -0,0 +1,27 @@ +--- +- name: Install NetworkManager and dependencies + pacman: name={{ item }} state=present + with_items: + - networkmanager + - networkmanager-openvpn + - network-manager-applet + - xfce4-notifyd + - gnome-keyring + +- name: Push trusted network list + template: src=trusted_networks.j2 dest=/usr/local/etc/trusted_networks + +- name: Verify trusted unit list exists + file: path=/usr/local/etc/trusted_units state=touch + +- name: Push trusted unit toggler + copy: src=toggle_units.sh dest=/usr/local/bin/toggle_units mode=0755 + +- name: Push network trust dispatcher + copy: src=trust_dispatcher.sh dest=/etc/NetworkManager/dispatcher.d/10trust mode=0755 + +- name: Enable and start NetworkManager + service: name=NetworkManager.service enabled=yes state=started + +- name: Enable and start NetworkManager dispatcher + service: name=NetworkManager-dispatcher.service enabled=yes state=started diff --git a/roles/network/templates/trusted_networks.j2 b/roles/networkmanager/templates/trusted_networks.j2 similarity index 100% rename from roles/network/templates/trusted_networks.j2 rename to roles/networkmanager/templates/trusted_networks.j2