Finally move the tasks/apache.yml to a role. This allows us to order it with the other roles.

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

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:

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:

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:

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:

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:

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"

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'

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:

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:

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:

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:

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"

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:

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:

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:

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"

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" }

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"

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:

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:

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"
 
 

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:

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"

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:

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:

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"

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"

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:

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"
 

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

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"

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"

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"

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"

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"

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

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:

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:

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"

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"

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"

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"

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"

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"

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

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"