From 788407cc9ae35b1b392d66a74917045a3d16c77b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 27 Aug 2017 23:32:28 -0500 Subject: [PATCH] correct service name - stock interfaces - rebased edits --- roles/network/tasks/debian.yml | 10 +++------- roles/network/tasks/enable_services.yml | 3 --- roles/network/tasks/restart.yml | 6 ++++++ roles/network/tasks/rpi_debian.yml | 14 ++++---------- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 27e50359d..7f0223134 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -55,13 +55,9 @@ service: name=networking state=restarted when: interface.changed -- name: Start up hostapd again - service: name=hostapd state=started - when: interface.changed - -- name: dhcpd may be affected - service: name=bind9 state=started - when: interface.changed +- name: start up dhcpcd again + service: name=dhcpcd state=started + when: interface.changed and dhcpcd_result == "enabled" #create lan br0 if lan_controller or gateway #create wan br0 if appliance diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 308a3056f..dd968341a 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -110,9 +110,6 @@ - { 0: 'gateway/iiab-gen-iptables', 1: '/usr/bin/iiab-gen-iptables' } - { 0: 'gateway/check-LAN', 1: '/usr/bin/check-LAN' } -- name: Execute the script that sets up userspace firewall - shell: iiab-gen-iptables - - name: Add 'squid' to service list ini_file: dest='{{ service_filelist }}' section=squid diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index 67ec681a5..61833144b 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -4,6 +4,12 @@ state=stopped when: not dhcpd_enabled +# assume NM is not running +- name: Start dhcpd + service: name=dhcpd + state=started + when: dhcpd_enabled and is_debuntu + - name: Stop named service service: name={{ dns_service }} state=stopped diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml index c6e25bd3c..e563634d9 100644 --- a/roles/network/tasks/rpi_debian.yml +++ b/roles/network/tasks/rpi_debian.yml @@ -63,17 +63,11 @@ ignore_errors: True when: interface.changed -- name: Restart the networking service +- name: start up dhcpcd again + service: name=dhcpcd state=started + +- name: restart the networking service service: name=networking state=restarted - when: interface.changed - -- name: Start up hostapd again - service: name=hostapd state=started - when: interface.changed - -- name: dhcpd may be affected - service: name=bind9 state=started - when: interface.changed #create lan br0 if lan_controller or gateway #create wan br0 if appliance