move proxy install option to 4-common

roles/4-server-options/tasks/main.yml

@@ -15,6 +15,26 @@
   when: openvpn_install
   tags: openvpn
 
+- name: Configuring wondershaper
+  include_tasks: roles/network/tasks/wondershaper.yml
+  when: wondershaper_install
+  tags: wondershaper, network
+
+- name: Configuring named
+  include_tasks: roles/network/tasks/named.yml
+  when: FQDN_changed
+  tags: named, network, domain
+
+- name: Configuring dhcpd
+  include_tasks: roles/network/tasks/dhcpd.yml
+  when: FQDN_changed
+  tags: dhcpd, network, domain
+
+- name: Configuring Squid
+  include_tasks: roles/network/tasks/squid.yml
+  when: squid_install
+  tags: squid, network, domain
+
 - name: NETWORK
   include_role:
     name: network

roles/network/tasks/main.yml

@@ -19,35 +19,6 @@
 #  when: 'iiab_wan_iface != "none" and wan_ip != "dhcp"'
 ##### End static ip address info
 
-- include_tasks: wondershaper.yml
-  tags:
-    - wondershaper
-    - network
-  when: wondershaper_install
-
-- name: Configuring named
-  include_tasks: named.yml
-  when: FQDN_changed
-  tags:
-    - named
-    - network
-    - domain
-
-- name: Configuring dhcpd
-  include_tasks: dhcpd.yml
-  when: FQDN_changed
-  tags:
-    - dhcpd
-    - network
-    - domain
-
-- name: Configuring Squid
-  include_tasks: squid.yml
-  when: squid_install
-  tags:
-    - squid
-    - network
-
 - include_tasks: hosts.yml
   tags:
     - network