+1 after nuking the sslonly line as mentioned on IRC.

-re

On 06/27/2013 02:04 PM, skvidal@fedoraproject.org wrote:

From: Seth Vidal skvidal@fedoraproject.org

This is for ticket https://fedorahosted.org/fedora-infrastructure/ticket/3857

mattdm wants cloud.fp.o to redirect to that page.

This _should_ implement that change. :)

two +1's needed

-sv

---

manifests/services/proxy.pp | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/manifests/services/proxy.pp b/manifests/services/proxy.pp index c90c171..429a59e 100644 --- a/manifests/services/proxy.pp +++ b/manifests/services/proxy.pp @@ -95,6 +95,14 @@ class proxy { sSLCertificateChainFile => "wildcard.fedoraproject.org.intermediate.cert", }

• httpd::website { "cloud.fedoraproject.org":

•    ips            => $wildcard_fpo_ips,
  

•    ssl            => true,
  

•    sslonly        => true,
  

•    cert_name      => "wildcard.fedoraproject.org",
  

•    sSLCertificateChainFile => "wildcard.fedoraproject.org.intermediate.cert",
  

• }
• httpd::website { "mirrors.fedoraproject.org": ips => $wildcard_fpo_ips, server_aliases => [ "mirrors.stg.fedoraproject.org" ],

@@ -798,6 +806,12 @@ if $puppetEnvironment == 'staging'{ target => "http://docs.fedoraproject.org/", }

• httpd::redirect { "cloud-front-page":

•    website => "cloud.fedoraproject.org",
  

•    path    => "/",
  

•    target  => "http://fedoraproject.org/en/get-fedora-options#clouds",
  

• }
• httpd::redirect { "infofeed": website => "fedoraproject.org", path => "/infofeed",