On Wed, Jul 29, 2015 at 12:00:26PM +0200, Patrick Uiterwijk wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Could I get retroactive +1s for the following commit, which fixes
pagure.org urls (instaad of getting them trapped in the
docs.pagure.org vhost).
+1 for me, I saw the error before and the fix is working now.
Thanks!
Pierre
1 files changed, 22 insertions(+), 0 deletions(-)
[puiterwijk@lockbox01 templates]$ git show HEAD
commit 0a7efdc4fb9fa7b14d2447294cae56100624f9b7
Author: Patrick Uiterwijk <puiterwijk(a)redhat.com>
Date: Wed Jul 29 09:57:44 2015 +0000
Make a
pagure.org -> pagure.io redirect
diff --git a/roles/pagure/frontend/templates/0_pagure.conf
b/roles/pagure/frontend/templates/0_pagure.conf
index ea81a92..05bb090 100644
- --- a/roles/pagure/frontend/templates/0_pagure.conf
+++ b/roles/pagure/frontend/templates/0_pagure.conf
@@ -27,6 +27,28 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000
display-na
{% endif %}
</VirtualHost>
+<VirtualHost *:443>
+{% if env == 'pagure-staging' %}
+ ServerName
stg.pagure.org
+{% else %}
+ ServerName
pagure.org
+{% endif %}
+
+ SSLEngine on
+ SSLProtocol all -SSLv2 -SSLv3
+ # Use secure TLSv1.1 and TLSv1.2 ciphers
+ Header always add Strict-Transport-Security "max-age=15768000; includeSubDomains;
preload"
+
+ SSLCertificateFile /etc/pki/tls/certs/docs.pagure.org.crt
+ SSLCertificateChainFile /etc/pki/tls/certs/docs.pagure.org.intermediate.crt
+ SSLCertificateKeyFile /etc/pki/tls/certs/docs.pagure.org.key
+{% if env == 'pagure-staging' %}
+ Redirect permanent /
https://stg.pagure.io/
+{% else %}
+ Redirect permanent /
https://pagure.io/
+{% endif %}
+</VirtualHost>
+
<VirtualHost *:443>
{% if env == 'pagure-staging' %}