diff --git a/.ansible-lint b/.ansible-lint index cc23d03bc4..b8e3a69d88 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -18,7 +18,6 @@ exclude_paths: - playbooks/fedmsgupdate.yml # Some playbooks contains hardcoded paths, so exclude them from check - playbooks/list-vms-per-host.yml - - playbooks/restart_unbound.yml - playbooks/set_root_auth_keys.yml - playbooks/update-proxy-dns.yml - playbooks/update_ticketkey.yml diff --git a/CONVENTIONS b/CONVENTIONS index f6b37fefe7..67eea24aac 100644 --- a/CONVENTIONS +++ b/CONVENTIONS @@ -23,7 +23,7 @@ specific function. Examples: host update, vhost update, vhost reboot. The playbooks/groups/ directory should contain one playbook per group. This should be used in the case of multiple machines/instances in a group. MUST include a hosts entry that describes the hosts in the group. -Examples: packages, proxy, unbound, virthost, etc. +Examples: packages, proxy, virthost, etc. Try and be descriptive with the name here. The playbooks/hosts/ directory should contain one playbook per 'host' diff --git a/inventory/group_vars/unbound b/inventory/group_vars/unbound deleted file mode 100644 index 26909ea388..0000000000 --- a/inventory/group_vars/unbound +++ /dev/null @@ -1,15 +0,0 @@ ---- -custom_rules: ['-A INPUT -p tcp -m tcp -s 209.132.184.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 209.132.184.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 38.145.48.0/23 --dport 53 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 38.145.48.0/23 --dport 53 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.181.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 209.132.181.0/24 --dport 53 -j ACCEPT'] -freezes: false -ipa_client_shell_groups: - - sysadmin-dns -ipa_client_sudo_groups: - - sysadmin-dns -ipa_host_group: unbound -ipa_host_group_desc: Unbound caching DNS -lvm_size: 10000 -mem_size: 2048 -num_cpus: 2 -postfix_group: vpn -primary_auth_source: ipa -tcp_ports: [80, 443] diff --git a/inventory/host_vars/unbound-cc-rdu01.fedoraproject.org b/inventory/host_vars/unbound-cc-rdu01.fedoraproject.org deleted file mode 100644 index 3af33bf984..0000000000 --- a/inventory/host_vars/unbound-cc-rdu01.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -datacenter: rdu-cc -dns1: 8.8.8.8 -dns2: 8.8.4.4 -eth0_ipv4_gw: 8.43.85.254 -eth0_ipv4_ip: 8.43.85.74 -eth0_nm: 255.255.255.0 -ks_repo: http://38.145.60.16/repo/rhel/RHEL7-x86_64/ -ks_url: http://38.145.60.16/repo/rhel/ks/kvm-rhel-7-ext -vmhost: virthost-cc-rdu02.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/unbound-ib01.fedoraproject.org b/inventory/host_vars/unbound-ib01.fedoraproject.org deleted file mode 100644 index 425b480849..0000000000 --- a/inventory/host_vars/unbound-ib01.fedoraproject.org +++ /dev/null @@ -1,38 +0,0 @@ ---- -datacenter: ibiblio -dns1: 152.2.21.1 -dns2: 152.2.253.100 -dns_search1: vpn.fedoraproject.org -dns_search2: fedoraproject.org -eth0_ipv4: 152.19.134.150 -eth0_ipv4_gw: 152.19.134.129 -eth0_ipv4_nm: 25 -eth0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fed1" -eth0_ipv6_gw: "2600:2701:4000:5211::1" -eth0_ipv6_nm: 104 -has_ipv6: yes -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext -network_connections: - - autoconnect: yes - ip: - address: - - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - dhcp4: no - dns: - - "{{ dns1 }}" - - "{{ dns2 }}" - - 2001:4860:4860::8888 - dns_search: - - "{{ dns_search1 }}" - - "{{ dns_search2 }}" - gateway4: "{{ eth0_ipv4_gw }}" - gateway6: "{{ eth0_ipv6_gw }}" - mac: "{{ ansible_default_ipv4.macaddress }}" - name: eth0 - type: ethernet -postfix_group: vpn -vmhost: ibiblio05.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/host_vars/unbound-osuosl01.fedoraproject.org b/inventory/host_vars/unbound-osuosl01.fedoraproject.org deleted file mode 100644 index b534eabda9..0000000000 --- a/inventory/host_vars/unbound-osuosl01.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -datacenter: osuosl -dns1: 8.8.8.8 -dns: "{{ dns1 }}" -dns2: 8.8.4.4 -eth0_ipv4_gw: 140.211.169.193 -eth0_ipv4_ip: 140.211.169.201 -eth0_ipv4_nm: 25 -eth0_nm: 255.255.255.128 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext -postfix_group: vpn -vmhost: osuosl01.fedoraproject.org -volgroup: /dev/vg_guests -vpn: true diff --git a/inventory/inventory b/inventory/inventory index 370c046a61..68e57ebf15 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -757,11 +757,6 @@ sundries02.iad2.fedoraproject.org [sundries_stg] sundries01.stg.iad2.fedoraproject.org -[unbound] -unbound-ib01.fedoraproject.org -unbound-cc-rdu01.fedoraproject.org -unbound-osuosl01.fedoraproject.org - [value] value01.iad2.fedoraproject.org value02.iad2.fedoraproject.org @@ -929,7 +924,6 @@ colo_virt [groupc:children] value -unbound staging builders bkernel diff --git a/main.yml b/main.yml index 4e37a02f07..e2b32d1cc1 100644 --- a/main.yml +++ b/main.yml @@ -73,7 +73,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/tang.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml deleted file mode 100644 index 0b0f7c16fa..0000000000 --- a/playbooks/groups/unbound.yml +++ /dev/null @@ -1,34 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml" - vars: - myhosts: "unbound" - -- name: make the box be real - hosts: unbound - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - base - - rkhunter - - nagios_client - - hosts - - { role: openvpn/client, - when: env != "staging" } - - ipa/client - - collectd/base - - unbound - - sudo - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - tasks: - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml deleted file mode 100644 index 782b14e14c..0000000000 --- a/playbooks/restart_unbound.yml +++ /dev/null @@ -1,16 +0,0 @@ -# This playboook restarts unbound on a host -# -# requires --extra-vars="target=somevhostname" -# - -- name: find instances - hosts: "{{ target }}" - gather_facts: False - user: root - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - import_tasks: "{{ tasks_path }}/restart_unbound.yml" diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index b6bc20c6ad..6cd0a7a06a 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -155,18 +155,10 @@ proxies: myvms_new:&proxies when: nodns is not defined or not nodns -- name: Fix unbound if necessary - # intersection - hosts that are in our dynamic group and also in unbound-dns - hosts: "myvms_new:&unbound" - user: root - vars_files: - /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - tasks: - - import_tasks: "{{ tasks_path }}/restart_unbound.yml" - # - name: get info on guests (postreboot) # virt: command=info # register: vminfo_post diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 7e559abc50..592051c948 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -187,17 +187,6 @@ # The actual items files here end in .j2 (they are templates) # So when adding or modifying them change the .j2 version in git. # -- name: install nrpe unbound check config - template: src=check_unbound_proc.cfg.j2 dest=/etc/nrpe.d/check_unbound_proc.cfg owner=root group=root mode=0644 - when: inventory_hostname.startswith('unbound') - notify: - - restart nrpe - tags: - - nagios_client -# -# The actual items files here end in .j2 (they are templates) -# So when adding or modifying them change the .j2 version in git. -# - name: install nrpe merged log check script on log01 template: src=check_merged_file_age.cfg.j2 dest=/etc/nrpe.d/check_merged_file_age.cfg owner=root group=root mode=0644 when: inventory_hostname.startswith('log0') diff --git a/roles/nagios_client/templates/check_unbound_proc.cfg.j2 b/roles/nagios_client/templates/check_unbound_proc.cfg.j2 deleted file mode 100644 index cbae839cfd..0000000000 --- a/roles/nagios_client/templates/check_unbound_proc.cfg.j2 +++ /dev/null @@ -1 +0,0 @@ -command[check_unbound_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'unbound' -u unbound diff --git a/roles/nagios_server/files/nagios/commands/unbound.cfg b/roles/nagios_server/files/nagios/commands/unbound.cfg deleted file mode 100644 index aa57db5a04..0000000000 --- a/roles/nagios_server/files/nagios/commands/unbound.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# 'check_unbound_80' command definition -define command{ - command_name check_unbound_80 - command_line $USER1$/check_dig -H $HOSTADDRESS$ -w 5 -c 9 -p 80 -l $ARG1$ -A "+tcp" - } - - -# 'check_unbound_443' command definition -define command{ - command_name check_unbound_443 - command_line $USER1$/check_dig_ssl -H $HOSTADDRESS$ -w 5 -c 9 -p 443 -L $ARG1$ -l $ARG2$ -A "+tcp" - } diff --git a/roles/nagios_server/files/nagios/services/procs.cfg b/roles/nagios_server/files/nagios/services/procs.cfg index d44caca3fc..0dd8bc5d17 100644 --- a/roles/nagios_server/files/nagios/services/procs.cfg +++ b/roles/nagios_server/files/nagios/services/procs.cfg @@ -27,13 +27,6 @@ define service { use defaulttemplate } -define service { - hostgroup unbound - service_description Unbound Process - check_command check_by_nrpe!check_unbound_proc - use defaulttemplate -} - # TODO: uncomment when retrace is moved #define service { # hostgroup retrace diff --git a/roles/nagios_server/files/nagios/services/unbound.cfg b/roles/nagios_server/files/nagios/services/unbound.cfg deleted file mode 100644 index 368d570d92..0000000000 --- a/roles/nagios_server/files/nagios/services/unbound.cfg +++ /dev/null @@ -1,14 +0,0 @@ -define service { - hostgroup_name unbound - service_description Unbound-80 - check_command check_unbound_80!www.fedoraproject.org - use defaulttemplate -} - -define service { - hostgroup_name unbound - service_description Unbound-443 - check_command check_unbound_443!8881!www.fedoraproject.org - use defaulttemplate -} - diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 3d83b06416..9f007827c8 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -141,7 +141,6 @@ - tcp.cfg - testcloud.cfg - udp.cfg - - unbound.cfg tags: - nagios_config - nagios_server @@ -237,7 +236,6 @@ - ssl.cfg - swap.cfg - templates.cfg - - unbound.cfg - vpnclients.cfg - vpn_server.cfg tags: @@ -253,7 +251,6 @@ with_items: - dns.cfg - smtp-mm.cfg - - unbound.cfg - templates.cfg - ping-ipv6.cfg tags: diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 index 6c12ea2097..33d00d06d4 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 @@ -26,13 +26,6 @@ define hostgroup { } -define hostgroup { - hostgroup_name unbound - alias External DNS - members {% for host in groups["unbound"]|sort %}{{ host }}{% if not loop.last %}, {% endif %} {% endfor %} - -} - {% for key, value in groups.items()|sort %} {% if groups[key] != [] and key.startswith('copr') %} define hostgroup { diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 index 4f2eaff007..fc567c3da6 100644 --- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 +++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 @@ -328,7 +328,6 @@ command[check_saslauthd]=/usr/lib64/nagios/plugins/check_procs -c 1:10 -C 'sasla command[check_readonly_fs]=/usr/lib64/nagios/plugins/check_readonly_fs command[check_postfix_queue]=/usr/lib64/nagios/plugins/check_postfix_queue -w 2 -c 5 command[check_merged_file_age]=/usr/lib64/nagios/plugins/check_file_age -w 120 -c 300 /var/log/merged/messages.log -command[check_unbound_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'unbound' -u unbound command[check_fedmsg_relay_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-relay' -u fedmsg command[check_fedmsg_hub_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub' -u fedmsg command[check_fedmsg_gateway_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-gateway' -u fedmsg diff --git a/roles/unbound/files/unbound.conf b/roles/unbound/files/unbound.conf deleted file mode 100644 index 76f0fc7007..0000000000 --- a/roles/unbound/files/unbound.conf +++ /dev/null @@ -1,528 +0,0 @@ -# -# See unbound.conf(5) man page. -# -# this is a comment. - -#Use this to include other text into the file. -#include: "otherfile.conf" - -# The server clause sets the main parameters. -server: - # whitespace is not necessary, but looks cleaner. - - # verbosity number, 0 is least verbose. 1 is default. - verbosity: 1 - - # print statistics to the log (for every thread) every N seconds. - # Set to "" or 0 to disable. Default is disabled. - # Needed for munin plugin - statistics-interval: 0 - - # enable cumulative statistics, without clearing them after printing. - # Needed for munin plugin - statistics-cumulative: no - - # enable extended statistics (query types, answer codes, status) - # printed from unbound-control. default off, because of speed. - # Needed for munin plugin - extended-statistics: yes - - # number of threads to create. 1 disables threading. - num-threads: 2 - - # specify the interfaces to answer queries from by ip-address. - # The default is to listen to localhost (127.0.0.1 and ::1). - # specify 0.0.0.0 and ::0 to bind to all available interfaces. - # specify every interface on a new 'interface:' labelled line. - # The listen interfaces are not changed on reload, only on restart. - # interface: 0.0.0.0 - # interface: ::0 - # interface: 192.0.2.153 - # interface: 192.0.2.154 - # interface: 2001:DB8::5 - #interface: 80.239.156.220@53 - #interface: 80.239.156.220@80 - #interface: 80.239.156.220@443 - #interface: 0.0.0.0@53 - interface: 0.0.0.0@80 - interface: 0.0.0.0@443 - interface: 0.0.0.0@53 - - # enable this feature to copy the source address of queries to reply. - # Socket options are not supported on all platforms. experimental. - # NOTE: Enable this option when specifying interface 0.0.0.0 or ::0 - # NOTE: Disabled per Fedora policy not to listen to * on default install - # interface-automatic: yes - interface-automatic: no - - # port to answer queries from - # port: 53 - - # specify the interfaces to send outgoing queries to authoritative - # server from by ip-address. If none, the default (all) interface - # is used. Specify every interface on a 'outgoing-interface:' line. - # outgoing-interface: 192.0.2.153 - # outgoing-interface: 2001:DB8::5 - # outgoing-interface: 2001:DB8::6 - - # number of ports to allocate per thread, determines the size of the - # port range that can be open simultaneously. - # outgoing-range: 4096 - - # permit unbound to use this port number or port range for - # making outgoing queries, using an outgoing interface. - # outgoing-port-permit: 32768 - - # deny unbound the use this of port number or port range for - # making outgoing queries, using an outgoing interface. - # Use this to make sure unbound does not grab a UDP port that some - # other server on this computer needs. The default is to avoid - # IANA-assigned port numbers. - # outgoing-port-avoid: "3200-3208" - - # number of outgoing simultaneous tcp buffers to hold per thread. - # outgoing-num-tcp: 10 - - # number of incoming simultaneous tcp buffers to hold per thread. - # incoming-num-tcp: 10 - - # buffer size for UDP port 53 incoming (SO_RCVBUF socket option). - # 0 is system default. Use 4m to catch query spikes for busy servers. - # so-rcvbuf: 0 - - # buffer size for UDP port 53 outgoing (SO_SNDBUF socket option). - # 0 is system default. Use 4m to handle spikes on very busy servers. - # so-sndbuf: 0 - - # EDNS reassembly buffer to advertise to UDP peers (the actual buffer - # is set with msg-buffer-size). 1480 can solve fragmentation (timeouts). - # edns-buffer-size: 4096 - - # buffer size for handling DNS data. No messages larger than this - # size can be sent or received, by UDP or TCP. In bytes. - # msg-buffer-size: 65552 - - # the amount of memory to use for the message cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # msg-cache-size: 4m - - # the number of slabs to use for the message cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # msg-cache-slabs: 4 - - # the number of queries that a thread gets to service. - # num-queries-per-thread: 1024 - - # if very busy, 50% queries run to completion, 50% get timeout in msec - # jostle-timeout: 200 - - # the amount of memory to use for the RRset cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # rrset-cache-size: 4m - - # the number of slabs to use for the RRset cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # rrset-cache-slabs: 4 - - # the time to live (TTL) value lower bound, in seconds. Default 0. - # If more than an hour could easily give trouble due to stale data. - # cache-min-ttl: 0 - - # the time to live (TTL) value cap for RRsets and messages in the - # cache. Items are not cached for longer. In seconds. - # cache-max-ttl: 86400 - - # the time to live (TTL) value for cached roundtrip times, lameness - # and EDNS version information for hosts. In seconds. - # infra-host-ttl: 900 - - # the number of slabs to use for the Infrastructure cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # infra-cache-slabs: 4 - - # the maximum number of hosts that are cached (roundtrip, EDNS, lame). - # infra-cache-numhosts: 10000 - - # Enable IPv4, "yes" or "no". - # do-ip4: yes - - # Enable IPv6, "yes" or "no". - # do-ip6: yes - - # Enable UDP, "yes" or "no". - # avoids this open resolver from becoming target for DNS Amplification - do-udp: yes - - # Enable TCP, "yes" or "no". - # do-tcp: yes - - # upstream connections use TCP only (and no UDP), "yes" or "no" - # useful for tunneling scenarios, default no. - # tcp-upstream: no - - # Detach from the terminal, run in background, "yes" or "no". - # do-daemonize: yes - - # control which clients are allowed to make (recursive) queries - # to this server. Specify classless netblocks with /size and action. - # By default everything is refused, except for localhost. - # Choose deny (drop message), refuse (polite error reply), - # allow (recursive ok), allow_snoop (recursive and nonrecursive ok) - # access-control: 0.0.0.0/0 refuse - # access-control: 127.0.0.0/8 allow - # access-control: ::0/0 refuse - # access-control: ::1 allow - # access-control: ::ffff:127.0.0.1 allow - access-control: 0.0.0.0/0 allow - - # if given, a chroot(2) is done to the given directory. - # i.e. you can chroot to the working directory, for example, - # for extra security, but make sure all files are in that directory. - # - # If chroot is enabled, you should pass the configfile (from the - # commandline) as a full path from the original root. After the - # chroot has been performed the now defunct portion of the config - # file path is removed to be able to reread the config after a reload. - # - # All other file paths (working dir, logfile, roothints, and - # key files) can be specified in several ways: - # o as an absolute path relative to the new root. - # o as a relative path to the working directory. - # o as an absolute path relative to the original root. - # In the last case the path is adjusted to remove the unused portion. - # - # The pid file can be absolute and outside of the chroot, it is - # written just prior to performing the chroot and dropping permissions. - # - # Additionally, unbound may need to access /dev/random (for entropy). - # How to do this is specific to your OS. - # - # If you give "" no chroot is performed. The path must not end in a /. - # chroot: "/var/lib/unbound" - chroot: "" - - # if given, user privileges are dropped (after binding port), - # and the given username is assumed. Default is user "unbound". - # If you give "" no privileges are dropped. - username: "unbound" - - # the working directory. The relative files in this config are - # relative to this directory. If you give "" the working directory - # is not changed. - directory: "/etc/unbound" - - # the log file, "" means log to stderr. - # Use of this option sets use-syslog to "no". - # logfile: "" - - # Log to syslog(3) if yes. The log facility LOG_DAEMON is used to - # log to, with identity "unbound". If yes, it overrides the logfile. - # use-syslog: yes - - # print UTC timestamp in ascii to logfile, default is epoch in seconds. - log-time-ascii: yes - - # the pid file. Can be an absolute path outside of chroot/work dir. - pidfile: "/var/run/unbound/unbound.pid" - - # file to read root hints from. - # get one from ftp://FTP.INTERNIC.NET/domain/named.cache - # root-hints: "" - - # enable to not answer id.server and hostname.bind queries. - # hide-identity: no - - # enable to not answer version.server and version.bind queries. - # hide-version: no - - # the identity to report. Leave "" or default to return hostname. - # identity: "" - - # the version to report. Leave "" or default to return package version. - # version: "" - - # the target fetch policy. - # series of integers describing the policy per dependency depth. - # The number of values in the list determines the maximum dependency - # depth the recursor will pursue before giving up. Each integer means: - # -1 : fetch all targets opportunistically, - # 0: fetch on demand, - # positive value: fetch that many targets opportunistically. - # Enclose the list of numbers between quotes (""). - # target-fetch-policy: "3 2 1 0 0" - - # Harden against very small EDNS buffer sizes. - # harden-short-bufsize: no - - # Harden against unseemly large queries. - # harden-large-queries: no - - # Harden against out of zone rrsets, to avoid spoofing attempts. - harden-glue: yes - - # Harden against receiving dnssec-stripped data. If you turn it - # off, failing to validate dnskey data for a trustanchor will - # trigger insecure mode for that zone (like without a trustanchor). - # Default on, which insists on dnssec data for trust-anchored zones. - harden-dnssec-stripped: yes - - # Harden against queries that fall under dnssec-signed nxdomain names. - harden-below-nxdomain: yes - - # Harden the referral path by performing additional queries for - # infrastructure data. Validates the replies (if possible). - # Default off, because the lookups burden the server. Experimental - # implementation of draft-wijngaards-dnsext-resolver-side-mitigation. - harden-referral-path: yes - - # Use 0x20-encoded random bits in the query to foil spoof attempts. - # This feature is an experimental implementation of draft dns-0x20. - # (this now fails on all GoDaddy customer domains, so disabled) - use-caps-for-id: no - - # Enforce privacy of these addresses. Strips them away from answers. - # It may cause DNSSEC validation to additionally mark it as bogus. - # Protects against 'DNS Rebinding' (uses browser as network proxy). - # Only 'private-domain' and 'local-data' names are allowed to have - # these private addresses. No default. - # private-address: 10.0.0.0/8 - # private-address: 172.16.0.0/12 - # private-address: 192.168.0.0/16 - # private-address: 192.254.0.0/16 - # private-address: fd00::/8 - # private-address: fe80::/10 - - # Allow the domain (and its subdomains) to contain private addresses. - # local-data statements are allowed to contain private addresses too. - # private-domain: "example.com" - - # If nonzero, unwanted replies are not only reported in statistics, - # but also a running total is kept per thread. If it reaches the - # threshold, a warning is printed and a defensive action is taken, - # the cache is cleared to flush potential poison out of it. - # A suggested value is 10000000, the default is 0 (turned off). - unwanted-reply-threshold: 10000000 - - # Do not query the following addresses. No DNS queries are sent there. - # List one address per entry. List classless netblocks with /size, - # do-not-query-address: 127.0.0.1/8 - # do-not-query-address: ::1 - - # if yes, the above default do-not-query-address entries are present. - # if no, localhost can be queried (for testing and debugging). - # do-not-query-localhost: yes - - # if yes, perform prefetching of almost expired message cache entries. - prefetch: yes - - # if yes, perform key lookups adjacent to normal lookups. - prefetch-key: yes - - # module configuration of the server. A string with identifiers - # separated by spaces. "iterator" or "validator iterator" - # module-config: "validator iterator" - - # File with DLV trusted keys. Same format as trust-anchor-file. - # There can be only one DLV configured, it is trusted from root down. - # Downloaded from https://secure.isc.org/ops/dlv/dlv.isc.org.key - dlv-anchor-file: "/etc/unbound/dlv.isc.org.key" - - # File with trusted keys for validation. Specify more than one file - # with several entries, one file per entry. - # Zone file format, with DS and DNSKEY entries. - # trust-anchor-file: "" - - # File with trusted keys, kept uptodate using RFC5011 probes, - # initial file like trust-anchor-file, then it stores metadata. - # Use several entries, one per domain name, to track multiple zones. - # auto-trust-anchor-file: "" - - # Trusted key for validation. DS or DNSKEY. specify the RR on a - # single line, surrounded by "". TTL is ignored. class is IN default. - # (These examples are from August 2007 and may not be valid anymore). - # trust-anchor: "nlnetlabs.nl. DNSKEY 257 3 5 AQPzzTWMz8qSWIQlfRnPckx2BiVmkVN6LPupO3mbz7FhLSnm26n6iG9N Lby97Ji453aWZY3M5/xJBSOS2vWtco2t8C0+xeO1bc/d6ZTy32DHchpW 6rDH1vp86Ll+ha0tmwyy9QP7y2bVw5zSbFCrefk8qCUBgfHm9bHzMG1U BYtEIQ==" - # trust-anchor: "jelte.nlnetlabs.nl. DS 42860 5 1 14D739EB566D2B1A5E216A0BA4D17FA9B038BE4A" - - # File with trusted keys for validation. Specify more than one file - # with several entries, one file per entry. Like trust-anchor-file - # but has a different file format. Format is BIND-9 style format, - # the trusted-keys { name flag proto algo "key"; }; clauses are read. - # trusted-keys-file: "" - trusted-keys-file: /etc/unbound/root.key - - # Ignore chain of trust. Domain is treated as insecure. - # domain-insecure: "example.com" - - # Override the date for validation with a specific fixed date. - # Do not set this unless you are debugging signature inception - # and expiration. "" or "0" turns the feature off. - # val-override-date: "" - - # The time to live for bogus data, rrsets and messages. This avoids - # some of the revalidation, until the time interval expires. in secs. - # val-bogus-ttl: 60 - - # The signature inception and expiration dates are allowed to be off - # by 10% of the lifetime of the signature from our local clock. - # This leeway is capped with a minimum and a maximum. In seconds. - # val-sig-skew-min: 3600 - # val-sig-skew-max: 86400 - - # Should additional section of secure message also be kept clean of - # unsecure data. Useful to shield the users of this validator from - # potential bogus data in the additional section. All unsigned data - # in the additional section is removed from secure messages. - val-clean-additional: yes - - # Turn permissive mode on to permit bogus messages. Thus, messages - # for which security checks failed will be returned to clients, - # instead of SERVFAIL. It still performs the security checks, which - # result in interesting log files and possibly the AD bit in - # replies if the message is found secure. The default is off. - # NOTE: TURNING THIS ON DISABLES ALL DNSSEC SECURITY - val-permissive-mode: no - - # Have the validator log failed validations for your diagnosis. - # 0: off. 1: A line per failed user query. 2: With reason and bad IP. - val-log-level: 1 - - # It is possible to configure NSEC3 maximum iteration counts per - # keysize. Keep this table very short, as linear search is done. - # A message with an NSEC3 with larger count is marked insecure. - # List in ascending order the keysize and count values. - # val-nsec3-keysize-iterations: "1024 150 2048 500 4096 2500" - - # instruct the auto-trust-anchor-file probing to add anchors after ttl. - # add-holddown: 2592000 # 30 days - - # instruct the auto-trust-anchor-file probing to del anchors after ttl. - # del-holddown: 2592000 # 30 days - - # auto-trust-anchor-file probing removes missing anchors after ttl. - # If the value 0 is given, missing anchors are not removed. - # keep-missing: 31622400 # 366 days - - # the amount of memory to use for the key cache. - # plain value in bytes or you can append k, m or G. default is "4Mb". - # key-cache-size: 4m - - # the number of slabs to use for the key cache. - # the number of slabs must be a power of 2. - # more slabs reduce lock contention, but fragment memory usage. - # key-cache-slabs: 4 - - # the amount of memory to use for the negative cache (used for DLV). - # plain value in bytes or you can append k, m or G. default is "1Mb". - # neg-cache-size: 1m - - # a number of locally served zones can be configured. - # local-zone: - # local-data: "" - # o deny serves local data (if any), else, drops queries. - # o refuse serves local data (if any), else, replies with error. - # o static serves local data, else, nxdomain or nodata answer. - # o transparent serves local data, but resolves normally for other names - # o redirect serves the zone data for any subdomain in the zone. - # o nodefault can be used to normally resolve AS112 zones. - # o typetransparent resolves normally for other types and other names - # - # defaults are localhost address, reverse for 127.0.0.1 and ::1 - # and nxdomain for AS112 zones. If you configure one of these zones - # the default content is omitted, or you can omit it with 'nodefault'. - # - # If you configure local-data without specifying local-zone, by - # default a transparent local-zone is created for the data. - # - # You can add locally served data with - # local-zone: "local." static - # local-data: "mycomputer.local. IN A 192.0.2.51" - # local-data: 'mytext.local TXT "content of text record"' - # - # You can override certain queries with - # local-data: "adserver.example.com A 127.0.0.1" - # - # You can redirect a domain to a fixed address with - # (this makes example.com, www.example.com, etc, all go to 192.0.2.3) - # local-zone: "example.com" redirect - # local-data: "example.com A 192.0.2.3" - # - # Shorthand to make PTR records, "IPv4 name" or "IPv6 name". - # You can also add PTR records using local-data directly, but then - # you need to do the reverse notation yourself. - # local-data-ptr: "192.0.2.3 www.example.com" - - # service clients over SSL (on the TCP sockets), with plain DNS inside - # the SSL stream. Give the certificate to use and private key. - # default is "" (disabled). requires restart to take effect. - ssl-service-key: "/etc/unbound/unbound_server.key" - ssl-service-pem: "/etc/unbound/unbound_server.pem" - ssl-port: 443 - - # request upstream over SSL (with plain DNS inside the SSL stream). - # Default is no. Can be turned on and off with unbound-control. - # ssl-upstream: no - -## Python config section. To enable: -## o use --with-pythonmodule to configure before compiling. -## o list python in the module-config string (above) to enable. -## o and give a python-script to run. -#python: -# # Script file to load -# # python-script: "/etc/unbound/ubmodule-tst.py" - - -# Remote control config section. -remote-control: - # Enable remote control with unbound-control(8) here. - # set up the keys and certificates with unbound-control-setup. - # Note: required for unbound-munin package - control-enable: yes - - # what interfaces are listened to for remote control. - # give 0.0.0.0 and ::0 to listen to all interfaces. - # control-interface: 127.0.0.1 - # control-interface: ::1 - - # port number for remote control operations. - # control-port: 953 - - # unbound server key file. - server-key-file: "/etc/unbound/unbound_server.key" - - # unbound server certificate file. - server-cert-file: "/etc/unbound/unbound_server.pem" - - # unbound-control key file. - control-key-file: "/etc/unbound/unbound_control.key" - - # unbound-control certificate file. - control-cert-file: "/etc/unbound/unbound_control.pem" - -# Stub zones. -# Create entries like below, to make all queries for 'example.com' and -# 'example.org' go to the given list of nameservers. list zero or more -# nameservers by hostname or by ipaddress. If you set stub-prime to yes, -# the list is treated as priming hints (default is no). -# stub-zone: -# name: "example.com" -# stub-addr: 192.0.2.68 -# stub-prime: "no" -# stub-zone: -# name: "example.org" -# stub-host: ns.example.com. - -# Forward zones -# Create entries like below, to make all queries for 'example.com' and -# 'example.org' go to the given list of servers. These servers have to handle -# recursion to other nameservers. List zero or more nameservers by hostname -# or by ipaddress. Use an entry with name "." to forward all queries. -# forward-zone: -# name: "example.com" -# forward-addr: 192.0.2.68 -# forward-addr: 192.0.2.73@5355 # forward to port 5355. -# forward-zone: -# name: "example.org" -# forward-host: fwd.example.com diff --git a/roles/unbound/handlers/main.yml b/roles/unbound/handlers/main.yml deleted file mode 100644 index e437eebe21..0000000000 --- a/roles/unbound/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ -- 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 diff --git a/roles/unbound/tasks/main.yml b/roles/unbound/tasks/main.yml deleted file mode 100644 index 008f44190e..0000000000 --- a/roles/unbound/tasks/main.yml +++ /dev/null @@ -1,42 +0,0 @@ -- name: install unbound package - package: name={{ item }} state=present - with_items: - - unbound - -- name: install unbound config - copy: src=unbound.conf dest=/etc/unbound/unbound.conf mode=644 - notify: - - restart unbound - -- name: setup SELinux dns 80 - command: touch /root/dns80 creates=/root/dns80 - notify: - - semanage dns80 - -- name: setup SELinux dns 443 - command: touch /root/dns443 creates=/root/dns443 - notify: - - semanage dns443 - -- name: setup SELinux dns 8953 - command: touch /root/dns8953 creates=/root/dns8953 - notify: - - semanage dns8953 - -- name: copying unbound keys and certs - copy: src="{{ private }}/files/unbound/unbound_{{ item }}" dest=/etc/unbound/unbound_{{ item }} owner=root group=unbound mode=640 - with_items: - - control.key - - control.pem - - server.key - - server.pem - notify: - - restart unbound - tags: - - config - -- name: Enable and start unbound service - service: state=started enabled=true name=unbound - tags: - - service - - config diff --git a/tasks/restart_unbound.yml b/tasks/restart_unbound.yml deleted file mode 100644 index caef730ae6..0000000000 --- a/tasks/restart_unbound.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Restart unbound after reboots. - -- name: set selinux permissive - selinux: policy=targeted state=permissive - -- name: restart unbound - service: name=unbound state=restarted - -- name: set selinux back to enforcing - selinux: policy=targeted state=enforcing