From fdcad9a21dbd78fc32652a0f075d4a7d337dd235 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 16 May 2016 23:40:29 +0000 Subject: [PATCH] Drop download-ib02. All hail the new download-ib01 --- inventory/inventory | 1 - playbooks/groups/download.yml | 8 +------- roles/batcave/files/ssh_known_hosts | 1 - .../server/files/nagios/hostgroups/vpnclients.cfg | 2 +- .../server/files/nagios/hosts/download-ib02.cfg | 14 +++++++------- roles/rsyncd/files/rsyncd.conf.download-phx2 | 2 +- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index e08aeaee73..93499b6791 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -295,7 +295,6 @@ download05.phx2.fedoraproject.org [download-ibiblio] download-ib01.fedoraproject.org -download-ib02.fedoraproject.org [download-rdu2] download-rdu01.fedoraproject.org diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index b66fd31d0d..7ee97291c1 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -46,13 +46,7 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - when: env != "staging" - - name: put in script for syncing on download-ib02 - copy: src="{{ files }}/download/sync-up-downloads.sh" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 - when: inventory_hostname == 'download-ib02.fedoraproject.org' - - name: put in cron job for syncing - copy: src="{{ files }}/download/download-sync.cron" dest=/etc/cron.d/download-sync owner=root group=root mode=644 - when: inventory_hostname == 'download-ib02.fedoraproject.org' + - name: put in script for syncing on download-ib01 copy: src="{{ files }}/download/sync-up-downloads.sh.ib01" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 when: inventory_hostname == 'download-ib01.fedoraproject.org' diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index ad7b39d54a..fd4a7363a2 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -257,7 +257,6 @@ docs-dev-builder01.fedorainfracloud.org,docs-dev-builder01,172.25.32.65 ssh-rsa docs-dev-frontend.fedorainfracloud.org,docs-dev-frontend,172.25.32.64 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKZo1zwGAAI4ABC2rbzFfoXvAuoDs6ZWmMu+VP9akQu6alwXypnVZ/bWgolZuh4em4H/mUHj+ON+6UB5VfEuH4S/Q1VKZf0THdQHaMUXZmT3FHzSj98I8TwyWQxMpAYLvp6rFjOHQb6wFrVBrUxPsq5qKqspFGQ2119LhvL2pFdMhPy/b5wOtgc3ho5UjVmQNKEC4f6q5gwW/smEyrWPJzR7YeBbhaMWkHSwkKVZ9Q7aRvSZgJAZ4PCg1vrppvbTtcALElAu/mP+CnheVLT3ZmmFs8xzwemF5SxG8u2F/X+qGox/+/N7TJMOSJJqoE6UTxi7EOqfXXy63+L436fVxH docs-dev-frontend.fedorainfracloud.org docs-dev-master.fedorainfracloud.org,docs-dev-master,172.25.32.63 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAY05eSEk5bRoUbqPCJUEFMKa2yqj9jnuVY1bC1M8uCEOR5dck/aIy+TdOBuJvzVL3osA+pOkOpZGTddG2dDdSOcVZjsEHEbs1UwQKVMWhKw1G69zHLn7Bf+smWN3A9eajbhiq6qY+27RvKoRJih2Nktqc25HKtW318BKNMhjY7rqyJoQyfSamTK9Gh/yy8I4BP6WRCFXaxX/mPSS1JaRRSsmYfJ3ZDULTOsnRiMT6P5Oxi8/JjDIocp+ZUPNrDzW2A3hgecnz8XD2gkdgk63H4xWyQDyhkHe5j4RISmqEEauDOGThH7Q4TyM7S9h/UlEhTm9PfLl+wmrwohnMFdb/ docs-dev-master.fedorainfracloud.org download-ib01.fedoraproject.org,vm6.fedora.ibiblio.org,download-ib01,152.19.134.145,fe80::5054:ff:fe58:9690,192.168.1.87 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDrA+1LzvULjp4UI0JszFH6LHcY46jgsGHNdQ8r/LXcUnPWE0BcC1LnfwVpV/wKm0rp89I/DoWxISU8XQV9ZB0aett1W4pSzN7TaXE47dvf0d6JFMcgDNLshJYBpOAP2e93Tvr+eDRErSJXiflahZBQ7cUZ5Z9SVpB4YPX8+Crl00DvkQ+MgP4kfLHnG977gA+FunNYHGjq+9sNcvETiFod0uQfs/VHDTLHtZOTyurlXzJk46HdBkzrXliJdif7RqZZu4fUD1dC7MzKKOf6zLKTdHoJovoEWdENhmM0f9o+z8dtSppOoBCBCVRsXj2LRstwYWFFwOV7156uxG1e0oxx download-ib01.fedoraproject.org -download-ib02.fedoraproject.org,vm15.fedora.ibiblio.org,download-ib02,152.19.134.195,2610:28:3090:3001:5054:ff:fed9:f194,192.168.1.132 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkqXeFILQ8hXSRhjLymSZsKw/+Li0ellFyABDgTaksHj+KrSSeyP/R2jgo2K8y3vMfFJgNDQZdBjVLbkuzPKcpKXejsA+KkexA0XaawpsmzNWuWPcwbQBunWPOcjGMfV6QPI59C6X62Fe7z8AEaRje+okP0cAJv0pI5SBVLZYoXwsB4Z8Tdqi2F+rbXfjYJnAPO+BPH4M/JvjB8SMEkZ1w9SyAHl3pP0eiToXB3WrGD9pvIAfePj5YrnmVxsa0y1oKoKJx/6Y/sPENPcrUWsJbEyN8Um/rs7dVHfpzbrjJ+6AkUJpz9jjT/81RWsEqlKzVHKJexyrqpi2yCTCZGqwr download-ib02.fedoraproject.org download-rdu01.fedoraproject.org,unused,download-rdu01,204.85.14.1,192.168.1.84 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAw0pnmFzTUH8jT9RjOZgw2Lr8AS5fcEA7O6zjQYS0px35yTb1DvwnFHeSG7got/3fybf6t5YTeNKBdaz88Lth8WTovDdf/wG6BtGiN4jjP2N9x1hRkWrnb0k8VavLy/2MEAa2rlpOm6h2fFouGpWd39AFVtji1B3iUYWGzHnC9oNGvF2r+MV9AyXYd2lj0iQslv1LddJYk706l2UgOcOT8aLZrYIFQtIb5ruCfvcth0ee82JtuW6sBrZMxG4SIDp2JIWTCVwDFVyuQ5Q80ilRUanALn9/3MJ07HYJ/9qKSRJ06/dBCZoV7OsrROx+7iKw2kuZ21s1Q/mMEDl34q5lgQ== download-rdu01.fedoraproject.org download-rdu02.fedoraproject.org,unused,download-rdu02,204.85.14.2,192.168.1.85 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzcZ5hIHguRHVprrHRXcnjX9PqH3VHOvFQ2tl0N7SSyZbWYqTRpdOTW+QeAd1iFRD0wckNY/jU7F5UID/83y8ihaioRiJzTEw3x4CQHJcTt6r/EvR/PmWB7PeiRXZmItYSWc67dvjHyBtf1guyb+jpnQEpftORzh9aFv6usYClzPA/shCdq0svZg+e460486+AqNxlbpJquviYIRrVVJJJWHUtpgfzzqKJsjw6EC+7aOXLsFCfga0Okx3aKrmXKhnI5LSvGMCvC74izsaMju16cGQH5OIR804BZFe0XhIz+ox5BsuSAsNmff1ouB3nuwrRDUJ5jiux9aX9G8DaxKUGw== download-rdu02.fedoraproject.org download-rdu03.fedoraproject.org,unused,download-rdu03,204.85.14.3,192.168.1.86 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt6OIQmhQIHF1pBeuWqo20/w8qdRMtBEEMbO8W29D5vDi+3kt4VNMuTs+zzGQzFFLuAHb+GoaYJgU40Su6zlhz/BRrXnLkPiodaYoIjsUxTXSLAywP/zrTsl65D67xtqVE4rnBfMCe/JD1SUqig6tn9GJRMQpGak3tJIZcoPOcLKfMJisirZM69DF2zwu6hIF2F2vJG9iWv6Jb1ffVsoYibxCc1lFk7PjUmvYcqMEGtwh10VvDhkW9p8KAOiKEnzFrd64VFq0EJZwGVkKSRlAqADBEeyV5Jo2lgvl1P1O0RyWPtHZTpbyvPri6j82IbJ98+JlA552GT/JnXzAmoHhuw== download-rdu03.fedoraproject.org diff --git a/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg index 8a7a88f651..15c00dbef5 100644 --- a/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients - members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,osuosl02,proxy09,download-ib01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 } diff --git a/roles/nagios/server/files/nagios/hosts/download-ib02.cfg b/roles/nagios/server/files/nagios/hosts/download-ib02.cfg index 02ab047f8b..73956a8855 100644 --- a/roles/nagios/server/files/nagios/hosts/download-ib02.cfg +++ b/roles/nagios/server/files/nagios/hosts/download-ib02.cfg @@ -1,7 +1,7 @@ -define host { - host_name download-ib02 - alias download-ib02.fedoraproject.org - use defaulttemplate - address download-ib02.fedoraproject.org - parents ibiblio04 -} +#define host { +# host_name download-ib02 +# alias download-ib02.fedoraproject.org +# use defaulttemplate +# address download-ib02.fedoraproject.org +# parents ibiblio04 +#} diff --git a/roles/rsyncd/files/rsyncd.conf.download-phx2 b/roles/rsyncd/files/rsyncd.conf.download-phx2 index 5f5b35f662..c3d75f4cd0 100644 --- a/roles/rsyncd/files/rsyncd.conf.download-phx2 +++ b/roles/rsyncd/files/rsyncd.conf.download-phx2 @@ -101,7 +101,7 @@ refuse options = checksum list = no uid = 100103 gid = 101737 - hosts allow = 2001:388:1:4066:225:90ff:fec7:777e 10.0.0.0/8 71.19.151.18 128.171.104.148 129.101.198.59 129.21.171.98 129.7.128.189 129.7.128.190 130.239.17.3 149.20.20.132 140.247.173.57 152.19.134.145 152.19.134.195 182.255.111.7 198.129.224.34 199.6.1.170 200.17.202.1/28 202.158.214.12 204.152.191.36 208.96.144.16 208.96.144.70 sagres.c3sl.ufpr.br fedora.c3sl.ufpr.br ftp.nrc.ca frisal.switch.ch ultra.linux.cz ftp.linux.cz odysseus.fi.muni.cz odysseus.linux.cz bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rhlx01.hs-esslingen.de rsyncer.ftp.heanet.ie ftp.heanet.ie speculum.rbc.ru lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com scrye.com mirrors.xmission.com mirror.prgmr.com mirror.liquidtelecom.com archive.linux.duke.edu mirror.gtlib.gatech.edu mirrors.mit.edu mirrors.rit.edu sinclair.wpi.edu solar-one.mit.edu wpi.edu zaphod.gtlib.gatech.edu jobbot1.ibiblio.org torrent01.fedoraproject.org torrent02.fedoraproject.org download-ib01.fedoraproject.org download-ib02.fedoraproject.org tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org pao-korg-mirror.kernel.org + hosts allow = 2001:388:1:4066:225:90ff:fec7:777e 10.0.0.0/8 71.19.151.18 128.171.104.148 129.101.198.59 129.21.171.98 129.7.128.189 129.7.128.190 130.239.17.3 149.20.20.132 140.247.173.57 152.19.134.145 152.19.134.195 182.255.111.7 198.129.224.34 199.6.1.170 200.17.202.1/28 202.158.214.12 204.152.191.36 208.96.144.16 208.96.144.70 sagres.c3sl.ufpr.br fedora.c3sl.ufpr.br ftp.nrc.ca frisal.switch.ch ultra.linux.cz ftp.linux.cz odysseus.fi.muni.cz odysseus.linux.cz bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rhlx01.hs-esslingen.de rsyncer.ftp.heanet.ie ftp.heanet.ie speculum.rbc.ru lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com scrye.com mirrors.xmission.com mirror.prgmr.com mirror.liquidtelecom.com archive.linux.duke.edu mirror.gtlib.gatech.edu mirrors.mit.edu mirrors.rit.edu sinclair.wpi.edu solar-one.mit.edu wpi.edu zaphod.gtlib.gatech.edu jobbot1.ibiblio.org torrent01.fedoraproject.org torrent02.fedoraproject.org download-ib01.fedoraproject.org tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org pao-korg-mirror.kernel.org [fedora-archive0]