diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index 2ceaa44db3..e2e2634e88 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -177,8 +177,5 @@ - name: restart idmapd service: name=nfs-idmapd state=restarted -- name: restart darkserver - service: name=darkserver state=restarted - - name: restart buildmaster service: name=buildmaster state=restarted diff --git a/inventory/cloud b/inventory/cloud index e7fbd71718..aa53348b09 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -16,7 +16,6 @@ copr-fe.cloud.fedoraproject.org copr-fe-dev.cloud.fedoraproject.org copr-keygen.cloud.fedoraproject.org copr-keygen-dev.cloud.fedoraproject.org -darkserver-dev.fedorainfracloud.org developer.fedorainfracloud.org eclipse.fedorainfracloud.org elastic-dev.fedorainfracloud.org diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index 757ebfe446..aad8e75c8a 100644 --- a/inventory/group_vars/bastion +++ b/inventory/group_vars/bastion @@ -23,7 +23,7 @@ custom_rules: [ # TODO - remove modularity-wg membership here once it is not longer needed: # https://fedorahosted.org/fedora-infrastructure/ticket/5363 -fas_client_groups: sysadmin-ask,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-darkserver,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,modularity-wg,pungi-devel +fas_client_groups: sysadmin-ask,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,modularity-wg,pungi-devel # # This is a postfix gateway. This will pick up gateway postfix config in base diff --git a/inventory/group_vars/darkserver b/inventory/group_vars/darkserver deleted file mode 100644 index 31765e9afc..0000000000 --- a/inventory/group_vars/darkserver +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 6144 -num_cpus: 8 - -tcp_ports: [ 80, 443 ] - -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran - -freezes: false diff --git a/inventory/group_vars/darkserver-backend-stg b/inventory/group_vars/darkserver-backend-stg deleted file mode 100644 index 929e841592..0000000000 --- a/inventory/group_vars/darkserver-backend-stg +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 3144 -num_cpus: 2 - -tcp_ports: [] - -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran - -freezes: false diff --git a/inventory/group_vars/darkserver-web-stg b/inventory/group_vars/darkserver-web-stg deleted file mode 100644 index 92afc1a065..0000000000 --- a/inventory/group_vars/darkserver-web-stg +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 3144 -num_cpus: 2 - -tcp_ports: [ 80, 443 ] - -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran - -freezes: false diff --git a/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org deleted file mode 100644 index 7f4f08c5d4..0000000000 --- a/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ - -eth0_ip: 10.5.128.90 - -volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org - -datacenter: phx2 -sudoers: "{{ private }}/files/sudo/sysadmin-darkserver-sudoers" diff --git a/inventory/host_vars/darkserver-dev.fedorainfracloud.org b/inventory/host_vars/darkserver-dev.fedorainfracloud.org deleted file mode 100644 index 00a392f852..0000000000 --- a/inventory/host_vars/darkserver-dev.fedorainfracloud.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -image: rhel7-20141015 -instance_type: m1.large -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent -zone: nova -tcp_ports: [22, 80, 443] - -inventory_tenant: persistent -inventory_instance_name: darkserver-dev -hostbase: darkserver-dev -public_ip: 209.132.184.171 -root_auth_users: kushal -description: darkserver development instance - -cloud_networks: - # persistent-net - - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" diff --git a/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org deleted file mode 100644 index a159f9533a..0000000000 --- a/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ - -eth0_ip: 10.5.128.91 - -volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org - -datacenter: phx2 -sudoers: "{{ private }}/files/sudo/sysadmin-darkserver-sudoers" diff --git a/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org deleted file mode 100644 index 99ee4999b2..0000000000 --- a/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/ - -eth0_ip: 10.5.128.92 - -volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org - -datacenter: phx2 -sudoers: "{{ private }}/files/sudo/sysadmin-darkserver-sudoers" diff --git a/inventory/host_vars/darkserver02.phx2.fedoraproject.org b/inventory/host_vars/darkserver02.phx2.fedoraproject.org deleted file mode 100644 index 5a5f263a85..0000000000 --- a/inventory/host_vars/darkserver02.phx2.fedoraproject.org +++ /dev/null @@ -1,11 +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-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.7 -vmhost: virthost22.phx2.fedoraproject.org -datacenter: phx2 -sudoers: "{{ private }}/files/sudo/sysadmin-darkserver-sudoers" diff --git a/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org index b8342fc30f..4f5af389e9 100644 --- a/inventory/host_vars/db01.phx2.fedoraproject.org +++ b/inventory/host_vars/db01.phx2.fedoraproject.org @@ -17,7 +17,6 @@ databases: - blockerbugs - bodhi - bodhi2 -- darkserver - elections - fedocal - fedoratagger @@ -44,7 +43,6 @@ dbs_to_backup: - blockerbugs - bodhi - bodhi2 -- darkserver - elections - fedocal - fedoratagger diff --git a/inventory/host_vars/db03.phx2.fedoraproject.org b/inventory/host_vars/db03.phx2.fedoraproject.org index faae72d44f..16565fde78 100644 --- a/inventory/host_vars/db03.phx2.fedoraproject.org +++ b/inventory/host_vars/db03.phx2.fedoraproject.org @@ -12,13 +12,11 @@ datacenter: phx2 # This is a generic list, monitored by collectd databases: - mysql -- darkserver - fpo-mediawiki - pastebin # This is a more strict list of db to backup to /backups dbs_to_backup: -- darkserver - fpo-mediawiki - pastebin diff --git a/inventory/inventory b/inventory/inventory index 21a14263e6..075fbfae56 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -284,16 +284,6 @@ autosign01.phx2.fedoraproject.org [autosign-stg] autosign01.stg.phx2.fedoraproject.org -[darkserver] -darkserver02.phx2.fedoraproject.org - -[darkserver-web-stg] -darkserver-web01.stg.phx2.fedoraproject.org -darkserver-web02.stg.phx2.fedoraproject.org - -[darkserver-backend-stg] -darkserver-backend01.stg.phx2.fedoraproject.org - [dbserver] db01.phx2.fedoraproject.org db03.phx2.fedoraproject.org @@ -758,9 +748,6 @@ copr-be-dev.cloud.fedoraproject.org copr-dist-git-dev.fedorainfracloud.org copr-fe-dev.cloud.fedoraproject.org copr-keygen-dev.cloud.fedoraproject.org -darkserver-web01.stg.phx2.fedoraproject.org -darkserver-web02.stg.phx2.fedoraproject.org -darkserver-backend01.stg.phx2.fedoraproject.org datagrepper01.stg.phx2.fedoraproject.org db01.stg.phx2.fedoraproject.org db03.stg.phx2.fedoraproject.org @@ -1178,8 +1165,6 @@ modularity.fedorainfracloud.org modularity2.fedorainfracloud.org # Fedora Bootstrap VM fedora-bootstrap.fedorainfracloud.org -# darkserver development instance -darkserver-dev.fedorainfracloud.org # lists development instance lists-dev.fedorainfracloud.org # java-deptools ticket 4846 diff --git a/master.yml b/master.yml index fd34b2b8a2..a7d2d0cfe1 100644 --- a/master.yml +++ b/master.yml @@ -39,9 +39,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/darkserver-web.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/docker-registry.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/dhcp.yml @@ -130,7 +127,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/communityblog.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/commops.fedorainfracloud.org.yml -- import_playbook: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/developer.fedorainfracloud.org.yml - import_playbook: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml deleted file mode 100644 index 8b29d86d58..0000000000 --- a/playbooks/groups/darkserver-backend.yml +++ /dev/null @@ -1,76 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-backend:darkserver-backend-stg" - -- name: make the box be real - hosts: darkserver-backend:darkserver-backend-stg - 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 - - pre_tasks: - - - dnf: name=libsemanage-python state=present - - name: "Set SElinux booleans" - seboolean: name=httpd_can_network_connect_db state=yes persistent=yes - - roles: - - base - - collectd/base - - fas_client - - hosts - - nagios_client - - rsyncd - - sudo - - rkhunter - - redis - - { role: openvpn/client, when: env != "staging" } - - - role: apache - - tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: set up fedmsg basics - hosts: darkserver-backend:darkserver-backend-stg - 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: - - fedmsg/base - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: dole out the service-specific config - hosts: darkserver-backend:darkserver-backend-stg - 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: - - fedmsg/base - - fedmsg/hub - - rabbitmq - - darkserver/backend - - role: collectd/fedmsg-service - process: fedmsg-hub - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml deleted file mode 100644 index 42d491014c..0000000000 --- a/playbooks/groups/darkserver-web.yml +++ /dev/null @@ -1,40 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-web:darkserver-web-stg" - -- name: make the box be real - hosts: darkserver-web:darkserver-web-stg - 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 - - pre_tasks: - - - dnf: name=libsemanage-python state=present - - name: "Set SElinux booleans" - seboolean: name=httpd_can_network_connect_db state=yes persistent=yes - - roles: - - base - - collectd/base - - fas_client - - hosts - - nagios_client - - rkhunter - - rsyncd - - sudo - - { role: openvpn/client, when: env != "staging" } - - - role: apache - - darkserver/web - - tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml deleted file mode 100644 index 9a6b6161d4..0000000000 --- a/playbooks/groups/darkserver.yml +++ /dev/null @@ -1,40 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver:darkserver-stg" - -- name: make the box be real - hosts: darkserver - 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 - - pre_tasks: - - - package: name=libsemanage-python state=present - - name: "Set SElinux booleans" - seboolean: name=httpd_can_network_connect_db state=yes persistent=yes - - roles: - - base - - collectd/base - - fas_client - - rkhunter - - hosts - - nagios_client - - rsyncd - - sudo - - { role: openvpn/client, when: env != "staging" } - - - role: apache - - - darkserver - - tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml b/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml deleted file mode 100644 index 281a3fb72a..0000000000 --- a/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml +++ /dev/null @@ -1,33 +0,0 @@ -- name: check/create instance - hosts: darkserver-dev.fedorainfracloud.org - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/web/infra/ansible/vars/fedora-cloud.yml - - /srv/private/ansible/files/openstack/passwords.yml - - tasks: - - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - - import_tasks: "{{ tasks_path }}/growroot_cloud_el7.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: setup all the things - hosts: darkserver-dev.fedorainfracloud.org - gather_facts: True - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/private/ansible/files/openstack/passwords.yml - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - pre_tasks: - - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - - name: set hostname (required by some services, at least postfix need it) - hostname: name="{{inventory_hostname}}" - - roles: - - basessh diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index fb1fe2b2d9..fd0fe0d901 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -121,13 +121,6 @@ destname: askbot proxyurl: "{{ varnish_url }}" - - role: httpd/reverseproxy - website: darkserver.fedoraproject.org - destname: darkserver - remotepath: /darkserver/ - # Talk directly to the app server, not haproxy - proxyurl: http://localhost:10009 - - role: httpd/reverseproxy website: paste.fedoraproject.org destname: modernpaste diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index e8b8016564..b546929342 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -467,12 +467,6 @@ sslonly: true cert_name: "{{wildcard_cert_name}}" - - role: httpd/website - name: darkserver.fedoraproject.org - server_aliases: [darkserver.stg.fedoraproject.org] - sslonly: true - cert_name: "{{wildcard_cert_name}}" - - role: httpd/website name: paste.fedoraproject.org server_aliases: diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml index 80d816225a..40f77f3d7e 100644 --- a/roles/apps-fp-o/files/apps.yaml +++ b/roles/apps-fp-o/files/apps.yaml @@ -502,25 +502,6 @@ children: of a Fedora package? This is where the change histories of all the packages in Fedora for every release of Fedora (and EPEL) are kept.. forever! A gold mine. - - name: Darkserver - data: - url: https://darkserver.fedoraproject.org - source_url: https://github.com/kushaldas/darkserver - bugs_url: https://github.com/kushaldas/darkserver/issues - docs_url: https://fedoraproject.org/wiki/Darkserver - sops: - - https://infrastructure.fedoraproject.org/infra/docs/darkserver.rst - status_mappings: ['darkserver'] - description: > - A set of tools and JSON service to help userspace developers - to debug their applications and libraries. People are be - able query the service based on build-id(s) - or rpm package names. - - You can read more about why you - might want to use it or you can just click below to... - name: Mdapi data: url: https://apps.fedoraproject.org/mdapi diff --git a/roles/darkserver/backend/files/email.json b/roles/darkserver/backend/files/email.json deleted file mode 100644 index 4e7ed3a55a..0000000000 --- a/roles/darkserver/backend/files/email.json +++ /dev/null @@ -1 +0,0 @@ -"sysadmin-darkserver-members@fedoraproject.org" diff --git a/roles/darkserver/backend/files/loopback.py b/roles/darkserver/backend/files/loopback.py deleted file mode 100644 index 3b8b02136b..0000000000 --- a/roles/darkserver/backend/files/loopback.py +++ /dev/null @@ -1,11 +0,0 @@ -# This file is for staging only. -# It instructs all fedmsg processes on this machine to listen to the production -# bus.. as a kind of loopback. We have this here so staging darkserver can test -# against all of the prod activity. -config = { - 'endpoints': { - 'production-loopback': [ - 'tcp://hub.fedoraproject.org:9940', - ], - }, -} diff --git a/roles/darkserver/backend/tasks/main.yml b/roles/darkserver/backend/tasks/main.yml deleted file mode 100644 index e775501551..0000000000 --- a/roles/darkserver/backend/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ -# -# Setup darkserver packages -# - -- name: setup darkserver - dnf: name={{ item }} state=present - with_items: - - darkserver-importer - notify: - - restart fedmsg-hub - -# Use this to make stg darkserver listen to the prod bus. -#- name: install a loopback so we listen to the prod fedmsg bus (only in staging) -# copy: src=loopback.py dest=/etc/fedmsg.d/loopback.py -# notify: restart fedmsg-hub -# when: env == 'staging' - -- name: email.json file - copy: src=email.json dest=/etc/darkserver/email.json owner=root group=root mode=0644 - -- name: darkjobworker.conf - template: src=darkjobworker.conf.j2 dest=/etc/darkserver/darkjobworker.conf owner=root group=root mode=640 - notify: restart darkserver - - diff --git a/roles/darkserver/backend/templates/darkjobworker.conf.j2 b/roles/darkserver/backend/templates/darkjobworker.conf.j2 deleted file mode 100644 index 2d645a26e2..0000000000 --- a/roles/darkserver/backend/templates/darkjobworker.conf.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[darkserver] -{% if env == "staging" %} -host=db01.stg.phx2.fedoraproject.org -password={{ darkserver_stg_writer_password }} -{% else %} -host=db01.phx2.fedoraproject.org -password={{ darkserver_prod_writer_password }} -{% endif %} -database=darkserver -user=darkserver_writer -unique=127.0.0.1 diff --git a/roles/darkserver/files/email.json b/roles/darkserver/files/email.json deleted file mode 100644 index 4e7ed3a55a..0000000000 --- a/roles/darkserver/files/email.json +++ /dev/null @@ -1 +0,0 @@ -"sysadmin-darkserver-members@fedoraproject.org" diff --git a/roles/darkserver/tasks/main.yml b/roles/darkserver/tasks/main.yml deleted file mode 100644 index 27e623866f..0000000000 --- a/roles/darkserver/tasks/main.yml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Setup darkserver packages -# - -- name: setup darkserver - package: name={{ item }} state=present - with_items: - - darkserver - - darkserver-importer - -- name: email.json file - copy: src=email.json dest=/etc/darkserver/email.json owner=root group=root mode=0644 - -- name: darkserverweb.conf - template: src=darkserverweb.conf.j2 dest=/etc/darkserver/darkserverweb.conf owner=apache group=apache mode=0640 - notify: reload httpd - -- name: darkjobworker.conf - template: src=darkjobworker.conf.j2 dest=/etc/darkserver/darkjobworker.conf owner=apache group=apache mode=640 - notify: reload httpd - -- name: Copy over settings.py - when: env == "staging" - template: src=settings.py - dest=/etc/darkserver/settings.py - mode=0600 owner=apache group=apache - notify: reload httpd - diff --git a/roles/darkserver/templates/darkjobworker.conf.j2 b/roles/darkserver/templates/darkjobworker.conf.j2 deleted file mode 100644 index d6644ee141..0000000000 --- a/roles/darkserver/templates/darkjobworker.conf.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[darkserver] -{% if environment == "staging" %} -host=db01.stg.phx2.fedoraproject.org -password={{ darkserver_stg_writer_password }} -{% else %} -host=db01.phx2.fedoraproject.org -password={{ darkserver_prod_writer_password }} -{% endif %} -database=darkserver -user=darkserver_writer -unique=127.0.0.1 diff --git a/roles/darkserver/templates/darkserverweb.conf.j2 b/roles/darkserver/templates/darkserverweb.conf.j2 deleted file mode 100644 index fee2c03a54..0000000000 --- a/roles/darkserver/templates/darkserverweb.conf.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[darkserverweb] -{% if env == "staging" %} -host=db01.stg.phx2.fedoraproject.org -password={{ darkserver_stg_reader_password }} -{% else %} -host=db01.phx2.fedoraproject.org -password={{ darkserver_prod_reader_password }} -{% endif %} -user=darkserver_reader -database=darkserver diff --git a/roles/darkserver/templates/settings.py b/roles/darkserver/templates/settings.py deleted file mode 100644 index d971a88f19..0000000000 --- a/roles/darkserver/templates/settings.py +++ /dev/null @@ -1,172 +0,0 @@ -import os -import sys -import logging -import ConfigParser -config = ConfigParser.ConfigParser() -try: - config.read('/etc/darkserver/darkserverweb.conf') -except: # pragma: no cover - pass - -# Django settings for darkserverweb project. -sys.path.append('/usr/lib/python2.7/site-packages/darkserverweb/') - - -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -ALLOWED_HOSTS = [ - {% if env == 'staging' %} - 'darkserver.stg.fedoraproject.org', - {% else %} - 'darkserver.fedoraproject.org', - {% endif %} - '{{ inventory_hostname }}', - '{{ inventory_hostname_short }}', - 'localhost', -] - -ADMINS = ( - # ('Your Name', 'your_email@example.com'), -) - -MANAGERS = ADMINS - -try: - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': config.get('darkserverweb','database'), # Or path to database file if using sqlite3. - 'USER': config.get('darkserverweb','user'), # Not used with sqlite3. - 'PASSWORD': config.get('darkserverweb','password') , # Not used with sqlite3. - 'HOST': config.get('darkserverweb','host'), # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } - } -except Exception, e: - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': './test.db', # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } - } - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'America/Chicago' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -#USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -#USE_L10N = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = os.path.dirname(__file__) - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash. -# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" -MEDIA_URL = '' - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = '' - -# URL prefix for static files. -# Example: "http://media.lawrence.com/static/" -STATIC_URL = '/static/' - -# URL prefix for admin static files -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' - -# Additional locations of static files -STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -# List of finder classes that know how to find static files in -# various locations. -#STATICFILES_FINDERS = ( -# 'django.contrib.staticfiles.finders.FileSystemFinder', -# 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -#) - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'vop)@ssylsglmcgzxa2)rs3(t6gt-h@#954mr598h16kzzqwi1' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'buildid', - #'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', -) - -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -#logging settings -#LOG_FILENAME = 'darkserver.log' -#logging.basicConfig( -# filename=os.path.join('/var', 'log', 'darkserver', LOG_FILENAME), -# level=logging.CRITICAL, -# format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s', -#) - diff --git a/roles/darkserver/web/files/email.json b/roles/darkserver/web/files/email.json deleted file mode 100644 index 4e7ed3a55a..0000000000 --- a/roles/darkserver/web/files/email.json +++ /dev/null @@ -1 +0,0 @@ -"sysadmin-darkserver-members@fedoraproject.org" diff --git a/roles/darkserver/web/tasks/main.yml b/roles/darkserver/web/tasks/main.yml deleted file mode 100644 index 9c5d40826d..0000000000 --- a/roles/darkserver/web/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Setup darkserver packages -# - -- name: setup darkserver - package: name={{ item }} state=present - with_items: - - darkserver - -- name: email.json file - copy: src=email.json dest=/etc/darkserver/email.json owner=root group=root mode=0644 - -- name: darkserverweb.conf - template: src=darkserverweb.conf.j2 dest=/etc/darkserver/darkserverweb.conf owner=apache group=apache mode=0640 - notify: reload httpd - -- name: Copy over settings.py - template: src=settings.py - dest=/etc/darkserver/settings.py - mode=0600 owner=apache group=apache - notify: reload httpd - diff --git a/roles/darkserver/web/templates/darkserverweb.conf.j2 b/roles/darkserver/web/templates/darkserverweb.conf.j2 deleted file mode 100644 index fee2c03a54..0000000000 --- a/roles/darkserver/web/templates/darkserverweb.conf.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[darkserverweb] -{% if env == "staging" %} -host=db01.stg.phx2.fedoraproject.org -password={{ darkserver_stg_reader_password }} -{% else %} -host=db01.phx2.fedoraproject.org -password={{ darkserver_prod_reader_password }} -{% endif %} -user=darkserver_reader -database=darkserver diff --git a/roles/darkserver/web/templates/settings.py b/roles/darkserver/web/templates/settings.py deleted file mode 100644 index 104996b8bd..0000000000 --- a/roles/darkserver/web/templates/settings.py +++ /dev/null @@ -1,160 +0,0 @@ -import os -import sys -import logging -import ConfigParser -config = ConfigParser.ConfigParser() -try: - config.read('/etc/darkserver/darkserverweb.conf') -except: # pragma: no cover - pass - -# Django settings for darkserverweb project. -sys.path.append('/usr/lib/python2.7/site-packages/darkserverweb/') - - -DEBUG = False -TEMPLATE_DEBUG = DEBUG - -ALLOWED_HOSTS = [ - {% if env == 'staging' %} - 'darkserver.stg.fedoraproject.org', - {% else %} - 'darkserver.fedoraproject.org', - {% endif %} - '{{ inventory_hostname }}', - '{{ inventory_hostname_short }}', - 'localhost', -] - -ADMINS = ( - # ('Your Name', 'your_email@example.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': config.get('darkserverweb','database'), # Or path to database file if using sqlite3. - 'USER': config.get('darkserverweb','user'), # Not used with sqlite3. - 'PASSWORD': config.get('darkserverweb','password') , # Not used with sqlite3. - 'HOST': config.get('darkserverweb','host'), # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'UTC' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -#USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -#USE_L10N = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = os.path.dirname(__file__) - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash. -# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" -MEDIA_URL = '' - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = '' - -# URL prefix for static files. -# Example: "http://media.lawrence.com/static/" -STATIC_URL = '/static/' - -# URL prefix for admin static files -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' - -# Additional locations of static files -STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -# List of finder classes that know how to find static files in -# various locations. -#STATICFILES_FINDERS = ( -# 'django.contrib.staticfiles.finders.FileSystemFinder', -# 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -#) - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'vop)@ssylsglmcgzxa2)rs3(t6gt-h@#954mr598h16kzzqwi1' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'buildid', - #'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', -) - -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -#logging settings -#LOG_FILENAME = 'darkserver.log' -#logging.basicConfig( -# filename=os.path.join('/var', 'log', 'darkserver', LOG_FILENAME), -# level=logging.CRITICAL, -# format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s', -#) - diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index a336c5a12f..16f12a93bc 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -113,20 +113,6 @@ backend mirrormanager-backend {% endif %} option httpchk GET /mirrormanager/static/mirrormanager2.css -frontend darkserver-frontend - bind 0.0.0.0:10009 - default_backend darkserver-backend - -backend darkserver-backend - balance hdr(appserver) -{% if env == "production" %} - server darkserver02 darkserver02:80 check inter 20s rise 2 fall 3 -{% else %} - server darkserver-web01 darkserver-web01:80 check inter 20s rise 2 fall 3 - server darkserver-web02 darkserver-web02:80 check inter 20s rise 2 fall 3 -{% endif %} - option httpchk GET /darkserver/ - frontend bodhi2-frontend bind 0.0.0.0:10010 default_backend bodhi2-backend diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index ce4744bfb5..04151e0ec7 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -189,13 +189,6 @@ define service { use internalwebsitetemplate } -define service { - hostgroup_name darkserver - service_description http-darkserver-serverversion - use websitetemplate - check_command check_website!localhost!/darkserver/serverversion!server-version -} - define service { hostgroup_name datagrepper service_description http-datagrepper-frontpage diff --git a/roles/web-data-analysis/files/run-daily-awstats.sh b/roles/web-data-analysis/files/run-daily-awstats.sh index 1804680740..ee83bbb48d 100644 --- a/roles/web-data-analysis/files/run-daily-awstats.sh +++ b/roles/web-data-analysis/files/run-daily-awstats.sh @@ -44,7 +44,7 @@ HTMLDOC=/usr/bin/htmldoc #SITES="apps.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org docs.fedoraproject.org download.fedoraproject.org fedoramagazine.org fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org labs.fedoraproject.org mirrors.fedoraproject.org spins.fedoraproject.org start.fedoraproject.org" -SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org boot.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org darkserver.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org dl.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org " +SITES="admin.fedoraproject.org apps.fedoraproject.org arm.fedoraproject.org ask.fedoraproject.org badges.fedoraproject.org bodhi.fedoraproject.org boot.fedoraproject.org budget.fedoraproject.org bugz.fedoraproject.org cloud.fedoraproject.org codecs.fedoraproject.org communityblog.fedoraproject.org copr.fedoraproject.org developer.fedoraproject.org developers.fedoraproject.org dl.fedoraproject.org docs.fedoraproject.org docs-old.fedoraproject.org download.fedoraproject.org fas.fedoraproject.org fedora.my fedoracommunity.org fedoramagazine.org fedoraproject.com fedoraproject.org flocktofedora.net flocktofedora.org fonts.fedoraproject.org fpaste.org fudcon.fedoraproject.org geoip.fedoraproject.org get.fedoraproject.org getfedora.org help.fedoraproject.org id.fedoraproject.org it.fedoracommunity.org join.fedoraproject.org k12linux.org kde.fedoraproject.org l10n.fedoraproject.org labs.fedoraproject.org lists.fedorahosted.org lists.fedoraproject.org meetbot-raw.fedoraproject.org meetbot.fedoraproject.org mirrors.fedoraproject.org nightly.fedoraproject.org osbs.fedoraproject.org paste.fedoraproject.org pdc.fedoraproject.org people.fedoraproject.org port389.org qa.fedoraproject.org redirect.fedoraproject.org registry.fedoraproject.org smolts.org spins.fedoraproject.org src.fedoraproject.org start.fedoraproject.org store.fedoraproject.org taskotron.fedoraproject.org translate.fedoraproject.org uk.fedoracommunity.org " pushd ${CONFDIR} for SITE in ${SITES}; do