diff --git a/inventory/backups b/inventory/backups index e6e7d30311..d070dfd24e 100644 --- a/inventory/backups +++ b/inventory/backups @@ -2,13 +2,11 @@ # This is the list of clients we backup with rdiff-backup. # [backup_clients] -collab03.fedoraproject.org db01.phx2.fedoraproject.org db03.phx2.fedoraproject.org db-datanommer02.phx2.fedoraproject.org db-fas01.phx2.fedoraproject.org hosted03.fedoraproject.org -hosted-lists01.fedoraproject.org batcave01.phx2.fedoraproject.org infinote.fedoraproject.org pagure01.fedoraproject.org diff --git a/inventory/group_vars/newhosted b/inventory/group_vars/newhosted deleted file mode 100644 index 91cf319b26..0000000000 --- a/inventory/group_vars/newhosted +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 250000 -mem_size: 8192 -num_cpus: 4 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [ 22, 25, 80, 443 ] - -fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice,sysadmin-hosted,sysadmin-veteran - -freezes: false -postfix_group: vpn - -# Configuration for the git-daemon/server -git_group: git -git_port: 9418 -git_server: /usr/libexec/git-core/git-daemon -git_server_args: --export-all --syslog --inetd --verbose -git_basepath: /srv/git/ -git_daemon_user: git - -# For the MOTD -csi_security_category: Low -csi_primary_contact: Fedora admins - admin@fedoraproject.org -csi_purpose: Run the fedorahosted.org instances -csi_relationship: | - There are a few things running here: - - - Apache to service cgit and other content - - - Git repos - - - This host is not yet in service. diff --git a/inventory/host_vars/collab03.fedoraproject.org b/inventory/host_vars/collab03.fedoraproject.org deleted file mode 100644 index cf97b5151a..0000000000 --- a/inventory/host_vars/collab03.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -host_backup_targets: ['/srv'] -virt_install_command: "{{ virt_install_command_rhel6 }}" diff --git a/inventory/host_vars/hosted-lists01.fedoraproject.org b/inventory/host_vars/hosted-lists01.fedoraproject.org deleted file mode 100644 index 5d8ad18224..0000000000 --- a/inventory/host_vars/hosted-lists01.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -freezes: false -datacenter: internetx -host_backup_targets: ['/srv'] diff --git a/inventory/host_vars/hosted01.fedoraproject.org b/inventory/host_vars/hosted01.fedoraproject.org deleted file mode 100644 index abca0b6ebd..0000000000 --- a/inventory/host_vars/hosted01.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.128 -gw: 140.211.169.193 -dns: 8.8.8.8 - -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_guests - -eth0_ip: 140.211.169.207 -eth0_gw: 255.255.255.128 - -vmhost: osuosl03.fedoraproject.org -datacenter: osuosl diff --git a/inventory/inventory b/inventory/inventory index ec90f9cf8b..edb025417b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -199,9 +199,6 @@ mdapi01.phx2.fedoraproject.org [mdapi-stg] mdapi01.stg.phx2.fedoraproject.org -[collab] -collab03.fedoraproject.org - [bodhi-backend] # This one handles the mashing/releng stuff bodhi-backend01.phx2.fedoraproject.org @@ -322,12 +319,8 @@ fas03.phx2.fedoraproject.org [fas-stg] fas01.stg.phx2.fedoraproject.org -[newhosted] -hosted01.fedoraproject.org - [hosted] hosted03.fedoraproject.org -hosted-lists01.fedoraproject.org [hotness] hotness01.phx2.fedoraproject.org @@ -1067,7 +1060,6 @@ bastion backup infracore hosted -collab smtp-mm memcached virthost diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index 16c4882d34..98c89d27d6 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -210,7 +210,6 @@ bvirthost09.phx2.fedoraproject.org,bvirthost09,10.5.125.117 ssh-rsa AAAAB3NzaC1y bvirthost10.phx2.fedoraproject.org,bvirthost10,10.5.125.118 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDaS808DZ2haBxHtvu8G5Tnn/FOJZO+eTE6WC7ccLq7S0kxxdeVrhv+ZNHp0vSUQgCYnAqI2BxEyN0sLKnYyzFW9qBtNcvGLRP2XjPgnou+pGN5d59YUiDPl3qGp0etEgpswx2tqi3DX61fXQfg9qJxdUXyvD+xUN/I9B2+jwJSXv/IGRIqUopf/GF91AgqRmE/aq4QZh2kNi7sF7l20hWnX+67wTigbHbsbpgwv50GDYNAqctRBtYHJden18SCBsPg7uqBvIUnv0lPsqCFuwO7VNHvTDJHK0rvzjLxaYDwhv/NtlhgdM4f+4MXCEi0NU0T59Zxgml5E+QjG0DBrrHT bvirthost10.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org,bvirthost11,10.5.125.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7y9C5ii1k9Pdf0BB3AofQPcL+a54vBreWcN6eoM4TLqFgD5Hm0D64owyEFf4k/0jYCBBuxa1bOqLA2kMBXEgengWCoU3/F6Ogc6ZHrg+/mcTK58JQxx82aJ36arqh2+PPS5kQMYxpQnCv/juENgqemABhgg+JJLCZ6qlIbcgUfeBADkzTKVEpyYlwoCvtg1PsBhQjymM45rgtnb6irya1+hsytUeasQVbzKEn64fkrdvV0Pxd/7r6nj0z7MH6Nx9f1++6puYU+pLL/Zc5CDNtSnkdFIS4L9bs5qT5TtgLjkb+Dr/TM9Vdsj/pjDiK4I46vSVeVNZJ9uaAoX0JVMxP bvirthost11.phx2.fedoraproject.org cloud-noc01.cloud.fedoraproject.org,cloud-noc01,209.132.184.17 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHfZz5tx4ni72dYXU3B3OjASIVBZtzl3hA4hfsPmppmmnGJlwlrIaA1OLY6iBbvnel84LKL2sELuavphenkBt6rMZma5iu+qSz9rooBcbAcTulK/IjPzbO7fhSj7EH0/Srai9Y8TkqUB89E6xz9SMatWOFqimQ3BZqvn+cGHVvv2Rhfg0cTZuiiqi+GKNIvQ8gQ1SmDx+VATNBRB4AgNNj43rQvKIIhVsZ1fNSdvhByXbRPfoydKFMh4/Ni7UEHqeLX42V8iz5N8AA8Xkw//LbL9GXST3XoQJT7IMhvyDMrMw94thhQaPyZQpc1I1iSa0jxVuoWuHAMi5QbRIYbr3D cloud-noc01.cloud.fedoraproject.org -collab03.fedoraproject.org,collab03,140.211.169.198,192.168.1.70 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAryrVdSXlFRhs+TSnE2BlEn8a3SlMJ7ik3v/B17Pz7rDPy/RspTUjJgIss/UTgMB5EuRiEbrc4xT5PsGAnwH6g4ypEnuL9aeadenlWHkbzv5YyELq4z8xNKwJ8O4C0HCcrnq2JA5cRQx89KEUuG3DEPvADoLszI/Vb5YOk1qhcJG3oR+tFqXE7M3mAofa09dp1orkdgDYkweWaHTi3gQJevjYgAzZVvmJx/YmgsukuCa+29l+bC3hpzco64ymHvY7bjAQws1gEqh5+9EMDzUYZnPTR0278eC+L4VVQOJaj2kT5UuoqciRaferMFEEcM9TJfupFDbqqnjymQOhTpeUxw== collab03.fedoraproject.org coloamer01.fedoraproject.org,coloamer01,67.203.2.66,2607:f188::21e:c9ff:fe42:836d,192.168.1.89 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzMY93iyU+7wDTeYj3Uek+2q0MsBXg4fWxy8Q3roGEn0Hn7GJC1vuH3F1zUbvAAKavKwr9z/e4PrEhdYjfA5/2hZb81f0iuVMqM816fY3CfreopY3fGvWT/ctTS/45cSNrjIKP8f/B6R9cudObDCOsFHTfNwLWPDIwXD0r30veFWv4zBX6CW1ItQIos2S1OykX7T1dEAf1bpB/IkpprkZzqbqnftWB//9xi/dWYM/Phs4QtFZoTTiRU/Y4vg/mXI1jbYTBt9koMCXUPnttGf8rM3bKpcil2HMW8Oz2j00jsMhLQ6IvLvZ+zd1yt5agV7ukeYz0DfILvqjaAnHerccj coloamer01.fedoraproject.org communityblog.fedorainfracloud.org,instance-207.cloud.fedoraproject.org,communityblog,172.25.32.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOPvCvfz50iy2T9tgwPDWVBTOXg39Kcf2PTzqV4fGJ1F1cgqqvzM6Peg9ckakP7lCHoYCGwY5hqZW4MVyyJq+VoNsqJ+52u4t+nW1GVZO6tDChI+mvAr21xkz/crhdEe0bRQJ4X3bo2mKo14USE76v0xqGJmymR/emrKbn1QzXi8gTUmh/TYUm62CZCvYFL4BAeWvRgtx9ZQUAn2H1hfj8BH7m6dwH1KMFvXjp1cDkZqJ/dLo9M5t0EDZehbqSIwFpLAk5PTEND/YFNHH66mExs+anaXTuxvlv4wz0hjU94oZ6AtVnT1l7pTgIWYTSPM7UILwg79kFutG6dfcDknzj communityblog.fedorainfracloud.org compose-aarch64-01.arm.fedoraproject.org,compose-aarch64-01,10.5.78.70 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEdqWXO88MZ2kvayGbFwo46/QZSxv1cKUpmQHSGDqMdQY7j5jzepfMiTt36nRQwIMgqkXbTQ9lUAfm977cc4sXcTnK+6PmZDrVU72PMrp0/dfF0Wz7+jR4Ot3WJMZImeciE9nV/JpAzSJvqRu+yMAa9rO1DlVkA05guqW3FqC7RnHsQ23MZioM7kwVtsiuC1l3undgSiqenLCLdLg6oMjEDmFuOu8xLHo7kH2xubyeiGD1P3SRNvV2VtVoaF+rasPNcuA4hxvHiGrRbm213IjwGrgU3yRCgP2LK0ZTMDLWzK6SDItT2y8Y0iG4grAkWLrfPbkEh8iOA/GQa3vlooTp compose-aarch64-01.arm.fedoraproject.org @@ -304,8 +303,6 @@ glittergallery-dev.fedorainfracloud.org,glittergallery-dev.cloud.fedoraproject.o gnome-backups01.phx2.fedoraproject.org,gnome-backups01,10.5.126.39 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT3bGLqR8qcww5oEqzvYJ6nenNHmX4f4dY7v0HEEHiNWDMsC2R7Fq4Mo5GCovS/ermST8JaJZaxfZ0KAhoBuh2M6EEYuFuOWobHXeMJN0vf4NFTtiY18kcAd9VP3AzTZhLO5UpuBdbIEwdzbyVnCB+HmEBa+DZii8lEBgXcnLfHgX8zwABBxhbtgomm1V5mJYdqSZOiMcFMlXmPc3gfyKtLdKimU2w9dnmH0t3SER8GEud3u2Q8osdi5N7EgteHE6k6WKqW81DL0Ty7Lwpt9lOGpk8DzdmY/5DvUe2O2l14JpZB++din1TUkoQGIOQzIMtwHvJpzurh8V+fKrIaQ8b gnome-backups01.phx2.fedoraproject.org grafana.cloud.fedoraproject.org,instance-44.cloud.fedoraproject.org,grafana,172.25.32.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfyOT6FtjMhnjcTiHkGM3LlOn0NRJGW6ErHvRBMKOc4CjyCSqijdtnZOGTTiUnF2XcIrbbg06eDABjnleyWIp4agvkwSGOL9MN5HO/099EnL2DA+dhSIWeGT8vjDqzRsFzRJ3pNxuOkUU3EwXY02CYxkKtT3945chLlMhlbHqXpkl2ro7e0R3DCbXtWs3Xf7ODrf4omF4E3uEizuZ9YYB9GaHyp21yc03RUHcyomW87DfGTUXgyYqfcxkGXE5oF5QrMiMbIuE4PmmDsYKHsJJOr9vFGF5Z6eO6PgUE8owptt2510ZrT5UMV6577vkMLVthC2Kbpkcw62VnsRkGrzRh grafana.cloud.fedoraproject.org host1plus01.fedoraproject.org,gdm4.unidis.com.br,host1plus01,5.175.150.48,2a00:d1a0:1::130,192.168.1.138 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzwQ5QbPlr827M2ktc3xfdyrvTGkQE1H9HA+HNOF8e/ACMTXZCzivXXOhRkp+7TLt6CycIgXBXSAG1yVCKtz4y+AAVwUN1NIPoRWy7shUsJI8H35tfMDEJRb/IEW4RmWN7z+xci4IEcFbloICKLUPKwVFqXBVqz0CJgtqHuH/1IjRW4TaHUR5Fe2SwphxSS2/sC3st0uibMogZA4Y3OKYL1QKWeZIeoi/ra1twGxetDBcUCgsqecwIkGje7vY09mggeAnKeUByhg8sqyFlmxnUnkuG3B6YAMm3xg4vLUsQkAlskVVGDTDB09NfI2I25e8CrsTNwCspebIOHyt0wsBh host1plus01.fedoraproject.org -hosted-lists01.fedoraproject.org,hosted-lists01,85.236.55.8,192.168.1.22 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyU4uNiIZNyCm+b8rwV+I6wAid2HCmmSW05X9+gSOcfEEf6H2IPYvIcDuB64ejIYjv4Dise/NPIxRrJbw9Ra/kLDauxbgSAeut0JmWgFddA7SPx5F6v9dZeT9m3teYq3vfl6KCXrodz3qCADlbZVSohQX5OeA10g1CYKyYHFA6Hhp6t/UGsyAF0AqyArkPYYthpDNQQZVpxZk0aZgaHgK7nZyeklusRvTIx6n4gTwlrZ0D1png+2Pwv2w5ecy1Jzh7KUqfRM6J3qnwuoy/SLL1l2+vLkj5R1ZCvpgv5PlXYc3hJCYBDFQw6klf4+eBhVI97RKdkEH4vJ2PPkYRwI54w== hosted-lists01.fedoraproject.org -hosted01.fedoraproject.org,hosted01.fedorapoject.org,hosted01,140.211.169.207,192.168.0.6 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlnT3S3v/KGDgwGT5uYRaXcVN1sE63bWlGn6roDyRTUqHDjoUkwEaBNOjDHCkNHov1FpqjkKE2mDr5r6u56mBUBmhIFAM6do4SeTJZfFI6K9SfcR4oHhxBowoLJ9Um7Pdbl4EE+mUABmOTqIQWixfLjEorppO17cIDMLqxyoLns6YRe0VYo53xoM2bYljH0WvauNlJETo2ESTiHJ0WBhBzbDxiwClIa8lBO6XcQ80x/YDj5PaeBU25eymG7HA1HyCGqP3fsbmnGAE2NtgnwvOEoH9FRn/5eO2Z0m5dQ/8mWFrsxshlLXBJCjWR8Lb8u1SYpPls5rt5tGgRtM9YyHgp hosted01.fedoraproject.org hosted03.fedoraproject.org,hosted03,git.fedorahosted.org,bzr.fedorahosted.org,svn.fedorahosted.org,140.211.169.199,192.168.1.16 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvrDCEFQAEtTskK4sOxlAX/0PG1+Ykw4yTujyiRd+SOnhcuircuQubdD0PEO11bq0jD9P9cFg67TQ7Y57xBLGHBXlJ7j7lbVsVwmWcN2h9i+U28FjE63QzxvVNFNWs/BIXk+2/20NZj4XxjvldfLTOKEh0srwGiMahzH1URksIq9OfaP9NggbteTd2S3FLd8L8D7sWrsDyD5zzfceoJAs8Tqz4X+5Eqs+56Z3qrnrZkPNkVisJ1AY5FKulGYSAaRLlYvL5kuLs+g0e9NGmm2ivrP+8fE/0k4FAtQjRc3MzB4wcDR0HAu09euwdW+ySWLA99FEmWBEDbkglZ4kmjeTYw== hosted03.fedoraproject.org hotness01.phx2.fedoraproject.org,hotness01,10.5.126.5 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuIPvwlIYk8drZivI4LSdEYNKa/h6AK/JRsLuT43HB/GLT2hPWk2FGBmpSZnt4XmGq2i/Z20+Z7Z0Pohqu9dsFmfYO2uo5Caguh7pIoPNYvQd/wqKfhtWLYSW1HwOC8AHMDdMYm5Ju7gXTM4GuK8LwawmUTUM9K/+Vsb+jGd91NwjX4XniXLnQCVW5xYYOxF3lLlfYCqI7Dfg2eUlZksk1LDBus/emnkJgFBFkCqkp2NPwshIEXkLOHWIZLCV7tEy3E1CIE3q+6mMBlvYaokMvbzyY1vq6i73uyyqYELrQ1vNGxLVVCeNtN32uDr66FMNLM34qLtiqAMT9hKawarVX hotness01.phx2.fedoraproject.org hotness01.stg.phx2.fedoraproject.org,hotness01.stg,10.5.126.4 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDyDlkZ+CTx1aKX18Wcyflaa+0KjRITUSUeLpCi/I6BoV9xe/QEaVItIr0NzwfvDP0bkfu3l/07eMob75y0Szlaq3azNSRbhyxfvJ+ihxHX4SDsCR1ccO8wY2AW2Jdjskeo5P8DFzmzl1E4677VAN4x3WPf316TPhm/Ej25DjRvxTVxXpUnopBlMJPpYjWFLES0O+Y+6seD5jmZ2xYKDBC8HsMcXpmCSYvW0+7OzL5veZK6jqXOB6UxohHmVfhDxGvvrfkoZewmWJb93r55sglJFeiDPlk6MANJOdPmWBIifvXWsYGD4T1n+c6ACLp7b6POMBLnWYi2tAI7JphCURQ5 hotness01.stg.phx2.fedoraproject.org diff --git a/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg index 15c00dbef5..779b13ff3e 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,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,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 } diff --git a/roles/nagios/server/files/nagios/hosts/collab03.cfg b/roles/nagios/server/files/nagios/hosts/collab03.cfg index 487a2ffbb5..400f504997 100644 --- a/roles/nagios/server/files/nagios/hosts/collab03.cfg +++ b/roles/nagios/server/files/nagios/hosts/collab03.cfg @@ -1,7 +1,7 @@ -define host { - host_name collab03 - alias collab03.fedoraproject.org - use defaulttemplate - address 140.211.169.198 - parents osuosl03 -} +#define host { +# host_name collab03 +# alias collab03.fedoraproject.org +# use defaulttemplate +# address 140.211.169.198 +# parents osuosl03 +#} diff --git a/roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg b/roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg index 665f0e67a0..767892a44f 100644 --- a/roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg +++ b/roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg @@ -1,7 +1,7 @@ -define host { - host_name hosted-lists01 - alias hosted-lists01.fedoraproject.org - use defaulttemplate - address 85.236.55.8 - parents internetx01 -} +#define host { +# host_name hosted-lists01 +# alias hosted-lists01.fedoraproject.org +# use defaulttemplate +# address 85.236.55.8 +# parents internetx01 +#} diff --git a/roles/nagios/server/files/nagios/services/ssl.cfg b/roles/nagios/server/files/nagios/services/ssl.cfg index 09b55fd7df..6974c75a2f 100644 --- a/roles/nagios/server/files/nagios/services/ssl.cfg +++ b/roles/nagios/server/files/nagios/services/ssl.cfg @@ -33,9 +33,9 @@ define service { use defaulttemplate } -define service { - host_name hosted-lists01 - service_description fedorahosted.org Wildcard SSL Cert - check_command check_ssl_cert!lists.fedoraproject.org!60 - use defaulttemplate -} +#define service { +# host_name hosted-lists01 +# service_description fedorahosted.org Wildcard SSL Cert +# check_command check_ssl_cert!lists.fedoraproject.org!60 +# use defaulttemplate +#}