Merge branch 'master' of /git/ansible

inventory/host_vars/beaker01.qa.fedoraproject.org

@@ -4,7 +4,7 @@ gw: 10.5.124.254
 dns: 10.5.126.21
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
 ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
-volgroup: /dev/Guests00
+volgroup: /dev/vg_guests
 eth0_ip: 10.5.124.228
-vmhost: virthost-comm01.qa.fedoraproject.org
+vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2

playbooks/groups/secondary.yml

@@ -47,6 +47,20 @@
       nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3",
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' }
 
+  - role: httpd/mod_ssl
+
+  - role: httpd/certificate
+    name: wildcard-2014.fedoraproject.org
+    SSLCertificateChainFile: wildcard-2014.fedoraproject.org.intermediate.cert
+
+  - role: httpd/website
+    name: secondary.fedoraproject.org
+    cert_name: "{{wildcard_cert_name}}"
+    server_aliases:
+    - alt.fedoraproject.org
+    - archive.fedoraproject.org
+    - archives.fedoraproject.org
+
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"