Make pagure.io be before pagure.org so that we always server that SSL cert by default
This commit is contained in:
parent
d70a77ccf4
commit
2bbe785292
1 changed files with 24 additions and 21 deletions
|
@ -28,27 +28,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</VirtualHost>
|
</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>
|
|
||||||
|
|
||||||
## End of redirects http -> https
|
## End of redirects http -> https
|
||||||
|
|
||||||
|
@ -117,6 +96,30 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
|
||||||
|
|
||||||
</VirtualHost>
|
</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>
|
<VirtualHost *:443>
|
||||||
{% if env == 'pagure-staging' %}
|
{% if env == 'pagure-staging' %}
|
||||||
ServerName docs.stg.pagure.org
|
ServerName docs.stg.pagure.org
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue