diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 574e309dc6..ddb9468380 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -17,7 +17,6 @@ - hosts - fas_client - collectd/base - - apache - mod_wsgi - ask - fedmsg/base diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index 47ec534ced..018ec22356 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -20,7 +20,6 @@ - hosts - fas_client - collectd/base - - apache - mod_wsgi - fedmsg/base - sudo diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 3f53cd99b6..2bf307d526 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -22,7 +22,6 @@ - hosts - fas_client - collectd/base - - apache - badges/frontend - fedmsg/base - rsyncd diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index 3ee7b82e97..baa9991dcd 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -25,7 +25,6 @@ when: env != "staging" } - mongodb - rabbitmq - - apache - mod_wsgi - basset/frontend - basset/worker diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 113eda6889..9a39f538e4 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -22,7 +22,6 @@ - rsyncd - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi - blockerbugs diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index c6eeaa1065..8e7e5666d1 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -24,7 +24,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index afdc6a262a..2d9eb68e8e 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -20,7 +20,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi - collectd/base diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 3243a22aca..0fad0c07f4 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -21,7 +21,6 @@ - collectd/base - rsyncd - memcached - - apache - mod_wsgi - fas_server - fedmsg/base diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml index 021b49245e..a00fbdacd7 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -21,7 +21,6 @@ - collectd/base - rsyncd - memcached - - apache - mod_wsgi - fas3_server - fedmsg/base diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index ec2989bdf6..13ba0acc48 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -20,7 +20,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi - collectd/base diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 99fe0eb796..7bab6e67b9 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -26,7 +26,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 9bbccdfb00..d2b3d47782 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -25,7 +25,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 221b1d31d3..a665d5087c 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -26,7 +26,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index b3d0da06b9..882802271d 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -24,7 +24,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - spamassassin - mod_wsgi diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index aea46eb7a3..66ad9101e3 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -55,7 +55,6 @@ - hosts - fas_client - collectd/base - - apache - mod_wsgi - httpd/mod_ssl diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 34d4bd3a83..3b7cfc1c28 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -21,7 +21,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 3c49b35237..cdc1297de4 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -22,7 +22,6 @@ - hosts - fas_client - collectd/base - - apache - mod_wsgi - fedmsg/base - notifs/frontend diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 5237609bae..d9524d0c13 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -25,7 +25,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index a7f8505ff9..86f5b00fe8 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -26,7 +26,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index f57bed8927..6768373993 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -41,7 +41,6 @@ roles: - role: openvpn/client when: env != "staging" - - apache - mod_wsgi - fedmsg/base - pdc/frontend diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 9c3cc4dbff..b4c61af4fe 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -24,7 +24,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index a0a61ad244..f7404a93db 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -43,7 +43,6 @@ - include: "{{ handlers }}/restart_services.yml" roles: - - apache - mod_wsgi - role: openvpn/client when: env != "staging" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 537694fb2a..6ba29ad57d 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -22,7 +22,6 @@ - hosts - fas_client - collectd/base - - apache - mod_wsgi - geoip - geoip-city-wsgi/app diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index f781868368..db988da932 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -26,7 +26,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 0628d17e8d..424c6174a8 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -26,7 +26,6 @@ - sudo - { role: openvpn/client, when: env != "staging" } - - apache - mod_wsgi tasks: diff --git a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml index 1933031577..a1fccf4dd2 100644 --- a/playbooks/hosts/grafana.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/grafana.cloud.fedoraproject.org.yml @@ -23,7 +23,6 @@ roles: - base - rkhunter - - apache - mod_wsgi #- graphite/graphite #- graphite/statsd diff --git a/playbooks/hosts/graphite.fedorainfracloud.org.yml b/playbooks/hosts/graphite.fedorainfracloud.org.yml index d04bc38559..a80e64e65c 100644 --- a/playbooks/hosts/graphite.fedorainfracloud.org.yml +++ b/playbooks/hosts/graphite.fedorainfracloud.org.yml @@ -23,7 +23,6 @@ roles: - base - rkhunter - - apache - mod_wsgi - certbot - graphite/graphite diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml index 848a8c1f44..d96cc71f34 100644 --- a/playbooks/hosts/iddev.fedorainfracloud.org.yml +++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml @@ -23,7 +23,6 @@ roles: - sudo - hosts - - apache - mod_wsgi - base diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 31185e2a00..d0fb1dd577 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -32,7 +32,6 @@ roles: - sudo - hosts - - apache - mod_wsgi - base diff --git a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml index 7d07691ccc..67150966e3 100644 --- a/playbooks/hosts/modernpaste.fedorainfracloud.org.yml +++ b/playbooks/hosts/modernpaste.fedorainfracloud.org.yml @@ -23,7 +23,6 @@ roles: - sudo - hosts - - apache - mod_wsgi - base