Merge branch 'master' of /git/ansible

playbooks/manual/get-system-packages.yml

@@ -4,15 +4,9 @@
 
 - name: Get installed packages
   hosts: builders:releng-compose:data-analysis01.phx2.fedoraproject.org
-  gather_facts: false
+  gather_facts: true
   user: root
 
-  vars_files:
-  - /srv/web/infra/ansible/vars/global.yml
-  - "/srv/private/ansible/vars.yml"
-  - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
-
-
   tasks:
 
   - name: yum_command 

roles/download/files/httpd/dl.fedoraproject.org/rewrite.conf

@@ -10,3 +10,5 @@ RedirectMatch 302 ^/pub/fedora/linux/atomic https://kojipkgs.fedoraproject.org/a
 Redirect 302 "/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo"
 Redirect 302 "/pub/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo"
 
+RedirectMatch 302 ^/atomic/repo/objects/(.*) https://d2os45suu8yck8.cloudfront.net/$1
+RedirectMatch 302 ^/atomic/repo/(.*) https://kojipkgs.fedoraproject.org/atomic/repo/$1

roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf

@@ -34,7 +34,3 @@ ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
 {% else %}
 Redirect 421 /
 {% endif %}
-
-# Atomic Objects
-RewriteCond %{HTTP:X-CloudFront} !^$
-RewriteRule "/atomic/repo/objects/(.*)" "https://d2os45suu8yck8.cloudfront.net/$1" [R=302,L]