FBR move jenkins to point to centos

[Stephen John Smoogen]

diff --git a/playbooks/include/proxies-redirects.yml
b/playbooks/include/proxies-redirects.yml
index 159c071..fd3fa6a 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -60,6 +60,12 @@
     target: http://ciscobinary.openh264.org/$1

   - role: httpd/redirectmatch
+    shortname: jenkins
+    website: jenkins.fedoraproject.org
+    regex: /(.*)$
+    target: https://jenkins-fedora-infra.apps.ci.centos.org/$1
+
+  - role: httpd/redirectmatch
     shortname: fpaste
     website: fpaste.org
     regex: /(.*)$
diff --git a/playbooks/include/proxies-websites.yml
b/playbooks/include/proxies-websites.yml
index 221d162..0eb415e 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -734,6 +734,12 @@
     cert_name: "{{wildcard_cert_name}}"

   - role: httpd/website
+    site_name: jenkins.fedoraproject.org
+    server_aliases: [jenkins.stg.fedoraproject.org]
+    sslonly: true
+    cert_name: "{{wildcard_cert_name}}"
+
+  - role: httpd/website
     site_name: beaker.qa.fedoraproject.org
     server_aliases: [beaker.qa.fedoraproject.org]
     # Set this explicitly to stg here.. as per the original puppet config.


-- 
Stephen J Smoogen.

[Stephen John Smoogen]

diff --git a/playbooks/include/proxies-redirects.yml
b/playbooks/include/proxies-redirects.yml
index 159c071..2100208 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -60,6 +60,11 @@
     target: http://ciscobinary.openh264.org/$1

   - role: httpd/redirectmatch
+    shortname: jenkins
+    website: jenkins.fedorainfracloud.org
+    target: https://jenkins-fedora-infra.apps.ci.centos.org
+
+  - role: httpd/redirectmatch
     shortname: fpaste
     website: fpaste.org
     regex: /(.*)$
diff --git a/playbooks/include/proxies-websites.yml
b/playbooks/include/proxies-websites.yml
index 221d162..35cd18d 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -734,6 +734,10 @@
     cert_name: "{{wildcard_cert_name}}"

   - role: httpd/website
+    site_name: jenkins.fedorainfracloud.org
+    cert_name: "jenkins.fedorainfracloud.org"
+
+  - role: httpd/website
     site_name: beaker.qa.fedoraproject.org
     server_aliases: [beaker.qa.fedoraproject.org]
     # Set this explicitly to stg here.. as per the original puppet config.



-- 
Stephen J Smoogen.

[Patrick Uiterwijk]

On Thu, Apr 26, 2018 at 12:10 AM, Stephen John Smoogen <smooge(a)gmail.com&gt; wrote:
>  diff --git a/playbooks/include/proxies-redirects.yml
>  b/playbooks/include/proxies-redirects.yml
>  index 159c071..2100208 100644
>  --- a/playbooks/include/proxies-redirects.yml
>  +++ b/playbooks/include/proxies-redirects.yml
>  @@ -60,6 +60,11 @@
>       target: http://ciscobinary.openh264.org/$1
>
>     - role: httpd/redirectmatch
>  +    shortname: jenkins
>  +    website: jenkins.fedorainfracloud.org
>  +    target: https://jenkins-fedora-infra.apps.ci.centos.org
>  +
>  +  - role: httpd/redirectmatch
>       shortname: fpaste
>       website: fpaste.org
>       regex: /(.*)$
>  diff --git a/playbooks/include/proxies-websites.yml
>  b/playbooks/include/proxies-websites.yml
>  index 221d162..35cd18d 100644
>  --- a/playbooks/include/proxies-websites.yml
>  +++ b/playbooks/include/proxies-websites.yml
>  @@ -734,6 +734,10 @@
>       cert_name: "{{wildcard_cert_name}}"
>
>     - role: httpd/website
>  +    site_name: jenkins.fedorainfracloud.org
>  +    cert_name: "jenkins.fedorainfracloud.org"
>  +
>  +  - role: httpd/website
>       site_name: beaker.qa.fedoraproject.org
>       server_aliases: [beaker.qa.fedoraproject.org]
>       # Set this explicitly to stg here.. as per the original puppet config.
>  

+1

[Ricky Elrod]

+1

On Wed, Apr 25, 2018 at 6:12 PM, Patrick Uiterwijk
<puiterwijk(a)redhat.com&gt; wrote:
> On Thu, Apr 26, 2018 at 12:10 AM, Stephen John Smoogen <smooge(a)gmail.com&gt;
wrote:
>> diff --git a/playbooks/include/proxies-redirects.yml
>> b/playbooks/include/proxies-redirects.yml
>> index 159c071..2100208 100644
>> --- a/playbooks/include/proxies-redirects.yml
>> +++ b/playbooks/include/proxies-redirects.yml
>> @@ -60,6 +60,11 @@
>>      target: http://ciscobinary.openh264.org/$1
>>
>>    - role: httpd/redirectmatch
>> +    shortname: jenkins
>> +    website: jenkins.fedorainfracloud.org
>> +    target: https://jenkins-fedora-infra.apps.ci.centos.org
>> +
>> +  - role: httpd/redirectmatch
>>      shortname: fpaste
>>      website: fpaste.org
>>      regex: /(.*)$
>> diff --git a/playbooks/include/proxies-websites.yml
>> b/playbooks/include/proxies-websites.yml
>> index 221d162..35cd18d 100644
>> --- a/playbooks/include/proxies-websites.yml
>> +++ b/playbooks/include/proxies-websites.yml
>> @@ -734,6 +734,10 @@
>>      cert_name: "{{wildcard_cert_name}}"
>>
>>    - role: httpd/website
>> +    site_name: jenkins.fedorainfracloud.org
>> +    cert_name: "jenkins.fedorainfracloud.org"
>> +
>> +  - role: httpd/website
>>      site_name: beaker.qa.fedoraproject.org
>>      server_aliases: [beaker.qa.fedoraproject.org]
>>      # Set this explicitly to stg here.. as per the original puppet config.
>>
>
>
> +1
> _______________________________________________
> infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
> To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org

[Kevin Fenzi]

+1 here.

You might test it out on a fast proxy (01/10) first to make sure all is
well before rolling to all of them...

kevin