Merge branch 'master' of /git/ansible

playbooks/groups/proxies.yml

@@ -78,65 +78,83 @@
   #
   # When we have a prerelease we also need to drop the config files.
 
-#  - name: Remove prerelease-to-final-spins-1
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-spins-1
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-spins-2
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-spins-2
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-labs-1
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-labs-1
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-labs-2
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-labs-2
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-arm-1
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-arm-1
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-arm-2
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-arm-2
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-gfo
-#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-gfo
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-spins
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-gfo-atomic-redirectmatch
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-labs
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-gfo-srv-redirectmatch
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
-#  - name: Remove prerelease-to-final-arm
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
-#    when: env == 'staging'
+  - name: Remove prerelease-to-final-gfo-ws-redirectmatch
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-spins
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-labs
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
+
+  - name: Remove prerelease-to-final-arm
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+    when: env == 'staging'
 
   roles:
   - httpd/mod_ssl