diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 5c414aac6e..8aef205828 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -58,10 +58,8 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - pre_tasks: - - include: "{{ tasks }}/apache.yml" - roles: + - apache - anitya/fedmsg - anitya/frontend - role: collectd/fedmsg-service diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index d186e91ad8..6501d79085 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -32,6 +32,7 @@ - hosts - fas_client - collectd/base + - apache - ask - fedmsg/base - rsyncd @@ -43,7 +44,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 641b49bfe1..48f58c5088 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -37,6 +37,7 @@ - hosts - fas_client - collectd/base + - apache - badges/frontend - fedmsg/base - rsyncd @@ -56,7 +57,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 99ad07cafc..70d66fa818 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -36,13 +36,13 @@ - rsyncd - { role: openvpn/client, when: env != "staging" } + - apache - blockerbugs tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index e7cd901123..fa05184ddc 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -38,12 +38,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index eeca3fb546..9f4f2f7d6d 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -39,12 +39,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 3c7d59d166..bd260e65ba 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -36,14 +36,13 @@ - 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" - # we want httpd for now, to examine the product directly - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 31c8749987..4882c0d306 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -50,6 +50,7 @@ - hosts - fas_client - collectd/base + - apache - download - { role: mod_limitipconn, when: ansible_distribution_major_version != '7'} - rsyncd @@ -63,7 +64,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" when: env != "staging" - - include: "{{ tasks }}/apache.yml" - name: put in script for syncing action: copy src="{{ files }}/download/sync-up-downloads.sh" dest=/usr/local/bin/sync-up-downloads owner=root group=root mode=755 when: datacenter == 'ibiblio' diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 66a1e7703b..4b4a9137d0 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -35,12 +35,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 27113f0fb6..274494da2b 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -40,6 +40,7 @@ - collectd/base - rsyncd - memcached + - apache - fas_server - fedmsg/base - sudo @@ -51,7 +52,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index b823e9ef75..6abe12aaf5 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 2974af521d..d1c5604ea5 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 47358a9373..f9f798ec7a 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -38,12 +38,12 @@ - fas_client - fedmsg/base - sudo + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 85b22a33f1..07302b1717 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -41,12 +41,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 11690c23aa..3d86da0a08 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 861a57327d..354e12ebd5 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 652c743b3d..6bde1c2a56 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -40,13 +40,13 @@ - collectd/base - { role: openvpn/client, when: env != "staging" } + - apache - keyserver tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index cb36f518db..1bc6fa9d32 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -30,9 +30,6 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - pre_tasks: - - include: "{{ tasks }}/apache.yml" - roles: - base - rkhunter @@ -42,6 +39,7 @@ - builder_repo - collectd/base - fedmsg/base + - apache - koji_hub - { role: koji_builder, when: env == "staging" } - { role: nfs/server, when: env == "staging" } diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 8b273486f0..388cebabec 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -32,6 +32,7 @@ - fas_client - sudo - collectd/base + - apache - kojipkgs - role: nfs/client mnt_dir: '/mnt/fedora_app/app' @@ -41,7 +42,6 @@ nfs_src_dir: 'fedora_koji' tasks: - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/koschei.yml b/playbooks/groups/koschei.yml index dd7140a27e..5638872216 100644 --- a/playbooks/groups/koschei.yml +++ b/playbooks/groups/koschei.yml @@ -32,16 +32,15 @@ - fas_client - builder_repo - collectd/base + - apache - koschei - fedmsg/base - sudo tasks: - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 10afa2878e..22e07ef3df 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -40,13 +40,13 @@ - 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" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 8d2e5ad71f..b3767f6aa7 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -37,6 +37,7 @@ - hosts - fas_client - collectd/base + - apache - mirrormanager/mirrorlist2 - sudo - { role: openvpn/client, @@ -47,7 +48,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 9f7fa9d1e0..259ae0f31f 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -36,12 +36,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index b3b8a98d21..edec189dbe 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -38,14 +38,12 @@ - fas_client - collectd/base - fedmsg/base + - apache - notifs/frontend - sudo - { role: openvpn/client, when: env != "staging" } - pre_tasks: - - include: "{{ tasks }}/apache.yml" - tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 3f2814d33e..51c0ddf134 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index a25717b586..8b8e8344aa 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -41,12 +41,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index 432a17133c..f17d292cf9 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -32,6 +32,7 @@ - hosts - fas_client - collectd/base + - apache - paste - rsyncd - sudo @@ -42,7 +43,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 18f8fc2915..8b3c68a963 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -42,6 +42,7 @@ - { role: denyhosts, when: ansible_distribution_major_version != '7' } - { role: openvpn/client, when: env != "staging" } - { role: collectd/fedmsg-service, process: fedmsg-hub } + - apache - git/hooks - git/make_checkout_seed - git/server @@ -58,7 +59,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 3470ffe252..08c8e152d9 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -40,12 +40,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index bddcfb64b9..75147bb72a 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -32,6 +32,7 @@ - fas_client - collectd/base - sudo + - apache - gitolite/base - cgit/base - cgit/clean_lock_cron @@ -47,7 +48,6 @@ tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/drbackupkey.yml" - include: "{{ tasks }}/2fa_client.yml" diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index a9b3e04044..35137fdc65 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -37,12 +37,12 @@ - rsyncd - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" # You might think we would want these tasks on the proxy nodes, but they # actually deliver a configuration that our proxy-specific roles below then go diff --git a/playbooks/groups/qadevel-stg.yml b/playbooks/groups/qadevel-stg.yml index 23bd453e6e..cc1ce6d686 100644 --- a/playbooks/groups/qadevel-stg.yml +++ b/playbooks/groups/qadevel-stg.yml @@ -38,6 +38,7 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache - { role: phabricator, tags: ['phabricator'] } tasks: @@ -45,7 +46,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index 8e34225d52..f060365843 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -38,13 +38,13 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index e0ed269eef..94441cb100 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -38,13 +38,13 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index ad269966b8..0a09571948 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -39,13 +39,13 @@ - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } - role: openvpn/client + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 1ccbcd8844..4fdab5230d 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -38,13 +38,13 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index e14f74e12d..81479b635d 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -47,6 +47,8 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3", nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' } + - role: apache + - role: httpd/mod_ssl - role: httpd/certificate @@ -64,7 +66,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - name: Install some misc packages needed for various tasks yum: pkg={{ item }} state=present diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index c45017da69..022f85164c 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -37,6 +37,7 @@ - hosts - fas_client - collectd/base + - apache - geoip - geoip-city-wsgi/app - role: koji_reminder @@ -58,7 +59,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index 2ce0e26109..cec3cb54e2 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -41,12 +41,12 @@ - sudo - { role: openvpn/client, when: env != "staging" } + - apache tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" handlers: diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index 25edd43a12..b88ee0cc3e 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -38,13 +38,13 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index 6a04cceb70..02dc7dd7eb 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -40,13 +40,13 @@ - { role: sudo, tags: ['sudo'] } - { role: openvpn/client, when: env != "staging", tags: ['openvpn_client'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index a42abb41d0..3859c62bd1 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -38,13 +38,13 @@ - { role: collectd/base, tags: ['collectd_base'] } - { role: yum-cron, tags: ['yumcron'] } - { role: sudo, tags: ['sudo'] } + - apache tasks: # this is how you include other task lists - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index d85e03e959..92a9a42801 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -35,6 +35,7 @@ - sudo - openvpn/client - torrent + - apache - role: httpd/mod_ssl @@ -51,7 +52,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index fef651590c..2cb948b0be 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -32,6 +32,7 @@ - hosts - fas_client - collectd/base + - apache - fedmsg/base - fedmsg/irc - supybot @@ -46,7 +47,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 06d0423ad5..5adb880ba9 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -40,6 +40,7 @@ - fedmsg/base - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } + - apache - mediawiki - sudo - { role: openvpn/client, @@ -49,7 +50,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 7bd0841eeb..022c5baa81 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -28,13 +28,13 @@ roles: - sudo - hosts + - apache tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" - include: "{{ tasks }}/postfix_basic.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" - name: mount up disk of persistent storage diff --git a/playbooks/hosts/logserver.yml b/playbooks/hosts/logserver.yml index 15a112dbef..43b49cd24c 100644 --- a/playbooks/hosts/logserver.yml +++ b/playbooks/hosts/logserver.yml @@ -30,6 +30,7 @@ - nagios_client - hosts - fas_client + - apache - collectd/base - collectd/server - sudo @@ -37,7 +38,6 @@ tasks: - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/openvpn_client_7.yml" diff --git a/tasks/apache.yml b/roles/apache/tasks/main.yml similarity index 100% rename from tasks/apache.yml rename to roles/apache/tasks/main.yml