On Wed, Jul 29, 2015 at 11:00 AM, Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> 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). Seems to work with testing so +1 > 1 files changed, 22 insertions(+), 0 deletions(-) > [puiterwijk@lockbox01 templates]$ git show HEAD > commit 0a7efdc4fb9fa7b14d2447294cae56100624f9b7 > Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> > 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' %} > > - -- > With kind regards, > Patrick Uiterwijk > Fedora Infra > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1 > > iQIcBAEBCgAGBQJVuKQ5AAoJEIZXmA2atR5Q/voP/jm5JZtzX1StwAN07b8CxfRK > 2dWxTL7nWagRqt+LcmootLNHb4GmH58wyS2XpEa+BlnDt33BeEK8AuoO4QdbISgI > tWygWNQwyPaME4gPRdxCNhnJ8Xo+9S/ss5j98dMqQz31MnwclxXdMsz0NYlyE4NX > DKgxfiJayelP6EjR1lfjnBTag7S+Hoj3QXBYU74ACky8Um0SKOLc/nRjX2ccHYFL > q3qwz4VedunKFvCmlhybGXVs5CANA6Z+W846jXQSiBXx7WaoduvIIYzKVX9Zmdll > ZMvjNk6ZmkKDuqKGG51FMyjMe4J0RMu9TW7pWWDYMz6+yOLcrJfUDp17w1JVbZ0g > jnuA7XnsEGsvcWoLU4dtClE0SIkyRnrL+A44Ahpa+5Xo1M0eZxUZ+6kBq0LSl5Jo > LhOpDhxQ25nVMqjMLjdmfn8+3usUl+8TkxSGnbeKljR6nnOtpA3wRCZ75UXmXf6/ > sr6eTCm7RF6+kbkovU7F8jS9aqMDP+Pvzz/GyB4eFuODhUGjPHVsvbh9XKY3YZfH > hW3wH85tabaoQJrH3OS0QPpnHln67Ey57tH9ZUroeNVKTx1ulw/o6/Dwdc34iY/D > YqWi6ak7QSkTWnuvpEumoM+Uk0BsgQSSa1gE2lObMCfTzC2jyO5lmghlO/ET3RCY > rkiGx/E3qRJ3qfp0dnDE > =Lbie > -----END PGP SIGNATURE----- > _______________________________________________ > infrastructure mailing list > infrastructure@xxxxxxxxxxxxxxxxxxxxxxx > https://admin.fedoraproject.org/mailman/listinfo/infrastructure _______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/infrastructure