From: Michael Scherer misc@zarb.org
--- handlers/restart_services.yml | 3 --- handlers/semanage.yml | 8 -------- playbooks/groups/blockerbugs.yml | 1 - playbooks/groups/dhcp.yml | 1 - playbooks/groups/logserver.yml | 1 - playbooks/groups/memcached.yml | 1 - playbooks/groups/openstack-compute-nodes.yml | 1 - playbooks/groups/unbound.yml | 1 - playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml | 1 - playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml | 1 - roles/unbound/handlers/main.yml | 11 +++++++++++ 11 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 handlers/semanage.yml create mode 100644 roles/unbound/handlers/main.yml
diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index 66f8335..a2e9669 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -120,9 +120,6 @@ - name: restart network action: service name=network state=restarted
-- name: restart unbound - action: service name=unbound state=restarted - - name: rebuild postfix transport command: /usr/sbin/postmap /etc/postfix/transport
diff --git a/handlers/semanage.yml b/handlers/semanage.yml deleted file mode 100644 index bb9db3f..0000000 --- a/handlers/semanage.yml +++ /dev/null @@ -1,8 +0,0 @@ -- name: semanage dns80 - command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 80 - -- name: semanage dns443 - command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 443 - -- name: semanage dns8953 - command: /usr/sbin/semanage port -a -t dns_port_t -p tcp 8953 diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 3916a98..27d4b16 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -33,4 +33,3 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index d0c34bb..55f2572 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -28,4 +28,3 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 42cf474..c045a30 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -38,7 +38,6 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml"
- name: Cloud Image stats hosts: log01.phx2.fedoraproject.org diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index b9593d5..0e0fea2 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -28,4 +28,3 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index fee6967..af154f6 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -27,4 +27,3 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 6e8c628..068c416 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -29,4 +29,3 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml" diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index aa824a2..73fe45c 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -28,5 +28,4 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml"
diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 0d0a6d1..102b0cc 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -29,7 +29,6 @@
handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/semanage.yml"
- name: dole out the service-specific config hosts: data-analysis01.phx2.fedoraproject.org diff --git a/roles/unbound/handlers/main.yml b/roles/unbound/handlers/main.yml new file mode 100644 index 0000000..e437eeb --- /dev/null +++ b/roles/unbound/handlers/main.yml @@ -0,0 +1,11 @@ +- name: restart unbound + action: service name=unbound state=restarted + +- name: semanage dns80 + command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 80 + +- name: semanage dns443 + command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 443 + +- name: semanage dns8953 + command: /usr/sbin/semanage port -a -t dns_port_t -p tcp 8953
infrastructure@lists.fedoraproject.org