diff --git a/inventory/group_vars/docs-backend b/inventory/group_vars/docs-backend deleted file mode 100644 index 030891687c..0000000000 --- a/inventory/group_vars/docs-backend +++ /dev/null @@ -1,12 +0,0 @@ ---- -lvm_size: 50000 -mem_size: 1024 -num_cpus: 1 -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file -virt_install_command: "{{ virt_install_command_rhel6 }}" - -tcp_ports: [ 80, 873 ] -fas_client_groups: sysadmin-noc,sysadmin-docs - -freezes: false diff --git a/inventory/host_vars/docs-backend01.phx2.fedoraproject.org b/inventory/host_vars/docs-backend01.phx2.fedoraproject.org deleted file mode 100644 index 1141381d86..0000000000 --- a/inventory/host_vars/docs-backend01.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 -ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_guests00 -eth0_ip: 10.5.126.45 -vmhost: virthost14.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index 862a0fd1da..e08aeaee73 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -153,9 +153,6 @@ datagrepper02.phx2.fedoraproject.org [datagrepper-stg] datagrepper01.stg.phx2.fedoraproject.org -[docs-backend] -docs-backend01.phx2.fedoraproject.org - [docs-dev] docs-dev-master.fedorainfracloud.org docs-dev-frontend.fedorainfracloud.org diff --git a/master.yml b/master.yml index b7028d9129..05cb12acad 100644 --- a/master.yml +++ b/master.yml @@ -45,7 +45,6 @@ - include: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml - include: /srv/web/infra/ansible/playbooks/groups/dhcp.yml - include: /srv/web/infra/ansible/playbooks/groups/dns.yml -- include: /srv/web/infra/ansible/playbooks/groups/docs-backend.yml - include: /srv/web/infra/ansible/playbooks/groups/docs-dev.yml - include: /srv/web/infra/ansible/playbooks/groups/download.yml - include: /srv/web/infra/ansible/playbooks/groups/elections.yml diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml deleted file mode 100644 index c7b1233201..0000000000 --- a/playbooks/groups/docs-backend.yml +++ /dev/null @@ -1,48 +0,0 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=docs-backend" - -- name: make the box be real - hosts: docs-backend - 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 - - fas_client - - collectd/base - - sudo - - { role: openvpn/client, - when: env != "staging" } - - apache - - tasks: - # this is how you include other task lists - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - -- name: setup publican web - hosts: docs-backend - 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: - - { role: publican_webhost, kojitag: "el6-docs", publican_brand: "fedora", site_title: "Fedora Documentation", site_host: "http://docs.fedoraproject.org" } - - handlers: - - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 29ab1e37b6..699857178d 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -353,13 +353,6 @@ localpath: /freemedia proxyurl: http://localhost:10011 - - role: httpd/reverseproxy - website: admin.fedoraproject.org - destname: docs-backend - localpath: /docs-backend - # Talk directly to the app server, not haproxy - proxyurl: http://docs-backend01 - - role: httpd/reverseproxy website: admin.fedoraproject.org destname: collectd diff --git a/roles/batcave/files/ssh_known_hosts b/roles/batcave/files/ssh_known_hosts index 1d0e788391..ad7b39d54a 100644 --- a/roles/batcave/files/ssh_known_hosts +++ b/roles/batcave/files/ssh_known_hosts @@ -253,7 +253,6 @@ dedicatedsolutions01.fedoraproject.org,dedicatedsolutions01,67.219.144.66,2604:1 developer.fedorainfracloud.org,developer,172.25.32.56 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSY2lm57B32qfEi6eq+DEsY27CcRj/Da+sbnlAO9zSGDUfrkLrvnpIHDIUU0tnmdDnErDC3jQllzBc4QVQFWVaEykMfnvbGooUc1Jlf4KjjF30L89AC3L84uRdghSVoW8CBQML4QJ2uYDP1Sp7hEaAuanNqnZdn6Nrt6Bi30zhl5NnL9ZLYfgWK+FrPE1ufYNO5PO5rHSOMLrU2oFADz5wekSWTCB0vLsjIbjaBxY/Y/Bj8AGU03ojFINmO9w7HtGFMWkfyzbA+4e7tkYjkjRNyUO5qzHVHwFHrtDf+p/1zlmauKVUIe4insDdJnoOEHP4vGLDXi5gfw+RHC6kHAND developer.fedorainfracloud.org dhcp01.phx2.fedoraproject.org,dhcp01,10.5.125.43 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFHs0iXw0sYRpBLbDnl4uQtFARF32BlmqvL7Un0zagEz3ArdL89ilY/CH+M+xthLIdhtxbSmV/uzrV2Tbr+Tomm1MpzFHlsYnwHcCnop5QW00Ksps1bTcQB4sw/gGpHabLtOMr7qjdROYnIZPiM3JhK+VevqaPazpk3YjA7J0FJn9ZC/FoLgkwInsYOzOzhS0WUcdJtsqc0RYh584gbCrucAw3fHyO9zVA9+yRv8K5m5hKJdnGHuo1V3fW79fYTRJjsSwXJ1uKkNY/QO+dmAiDFClIifyefNc9e8EHgl/phSRwtuZOZ8LvgzATp72qGveBogateTpVeejzbqxYzsIp dhcp01.phx2.fedoraproject.org docker-registry01.stg.phx2.fedoraproject.org,docker-registry01.stg,10.5.126.217 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCBsQmHU7/K3niMQ9ojPNdQArAZ6iIBzY3B/5J/CJovs779mH0leWN4JS5GI7EG6lpED+ytba1X2zpWqHCz0abn8unpolDAAAaSCtoudlUHb/9ucbHDOyNzlEgAIAhh4nyMbme7KLUSb+J1986mdGnCY6Razmt9d+n6XGh2GiJdiE9wB5li/RCZZreUU1X/QFquzDTv1U1455UojfPEi+b/8wXfLNi45i5g5GQi+IWgc4j70CNFpJcfYhPFEud0jpKcdkbubMvaakJEyhCW+LEmqARCwII1N9ozbKewRuHBxeozP+QgPsmKFx07VFu1AxzwDpcvE5HZMOyh1fQXWQ1 docker-registry01.stg.phx2.fedoraproject.org -docs-backend01.phx2.fedoraproject.org,docs-backend01,10.5.126.45,192.168.1.97 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtpxweUyk83Vz0sxWZlkcD0s+6YmPUTibp6ZlA54t32dyjdS+ovZeruf4A1E1k29mCDhIgBASqe2J1WFcSDzONYDbBOMvtxAmbOvVFJ6VIgoDHpObTvrLDIry8xq2hCSMsfQFC/unjhos1Ml2cgAEnI4Zs74q0QGRKhbtvOU6rgfCGJ1y2R3E/vLrHi7hOG+J7egsy2Rr6kCtFh914G8O7BYfrqLODTC8kukNoU0gIJFf/AMpa5V9awLSr/hLzTuqvh59aA050loUn5zxOeG3/SEBjIpwnP4OIe6gDHc7QBTETL/hHT7biw5gATQDdxbgJ+PNJx5PnaT9XG+lewmA3Q== docs-backend01.phx2.fedoraproject.org docs-dev-builder01.fedorainfracloud.org,docs-dev-builder01,172.25.32.65 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJN8Y/dG/VXhT6Bcilcog0+YKO8szl167x8/GvgJxPE8D8NIy8L0U78ltYnIyzWwqKZuWQ6VG4WgV8P2+gInFa+dpI/Z8W5yAQ96dWWKL+/RD/nTiURYtKc5VTyJuWWS9iKJ3jLsxnCJp5c/wee82GhD7i3wMEnmv00Q+U/qS5EPm/7nQMaJktze5SLI8Oaea3t99n4669kU9sJCS1RDjIVE9IOCeIkMjVxIpv5ncmvQR8lj+G1ij3at31jCy3hNUhkx9ZwGul6gT5ca7sz0DmfLg6FSKqLcuI/hJuw9GIo886ulZjfHBEXHid3y9l/1q6g1TuZbndC0Wt8AWvAqBN docs-dev-builder01.fedorainfracloud.org 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