From f5509ed401d798c5de568273c7498e8c4db8b0e9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 12 Mar 2015 14:53:58 +0000 Subject: [PATCH] Move the magazine config to a template and add staging version. Ticket 4683 --- roles/fedora-web/magazine/tasks/main.yml | 2 +- .../magazine/{files => templates}/fedoramagazine-web.conf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) rename roles/fedora-web/magazine/{files => templates}/fedoramagazine-web.conf (72%) diff --git a/roles/fedora-web/magazine/tasks/main.yml b/roles/fedora-web/magazine/tasks/main.yml index 7d57590207..5fdbea1ef3 100644 --- a/roles/fedora-web/magazine/tasks/main.yml +++ b/roles/fedora-web/magazine/tasks/main.yml @@ -1,5 +1,5 @@ - name: Copy some config files for {{website}} - copy: > + template: > src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}} owner=root group=root mode=0644 with_items: diff --git a/roles/fedora-web/magazine/files/fedoramagazine-web.conf b/roles/fedora-web/magazine/templates/fedoramagazine-web.conf similarity index 72% rename from roles/fedora-web/magazine/files/fedoramagazine-web.conf rename to roles/fedora-web/magazine/templates/fedoramagazine-web.conf index b8d22fa8a0..6f0cd2e686 100644 --- a/roles/fedora-web/magazine/files/fedoramagazine-web.conf +++ b/roles/fedora-web/magazine/templates/fedoramagazine-web.conf @@ -7,5 +7,11 @@ RewriteRule ^(.*)$ https://fedoramagazine.org%{REQUEST_URI} [L,R=301] #ProxyPass / http://wp-fedoramag.rhcloud.com/ #ProxyPassReverse / http://wp-fedoramag.rhcloud.com/ +{% if env == "production" %} ProxyPass / http://66.226.72.63/ ProxyPassReverse / http://66.226.72.63/ +{% else %} +# In staging we point to the staging version of the magazine +ProxyPass / http://104.207.133.220/ +ProxyPassReverse / http://104.207.133.220/ +{% endif %}