diff --git a/roles/pagure/frontend/templates/0_pagure.conf b/roles/pagure/frontend/templates/0_pagure.conf index 05bb0902a5..ec26dad4a4 100644 --- a/roles/pagure/frontend/templates/0_pagure.conf +++ b/roles/pagure/frontend/templates/0_pagure.conf @@ -6,6 +6,8 @@ WSGIPassAuthorization On WSGIDaemonProcess pagure user=git group=git maximum-requests=1000 display-name=pagure processes=4 threads=4 inactivity-timeout=300 WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-name=paguredocs processes=4 threads=4 inactivity-timeout=300 +## Redirects http -> https + {% if env == 'pagure-staging' %} ServerName stg.pagure.io @@ -16,7 +18,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na {% endif %} - {% if env == 'pagure-staging' %} ServerName docs.stg.pagure.org @@ -49,40 +50,7 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na {% endif %} - - -{% if env == 'pagure-staging' %} - ServerName docs.stg.pagure.org -{% else %} - ServerName docs.pagure.org -{% endif %} - - WSGIScriptAlias / /var/www/docs_pagure.wsgi - - 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 - - Alias /static /usr/lib/python2.7/site-packages/pagure/static/ - - - WSGIProcessGroup paguredocs - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - - +## End of redirects http -> https @@ -149,3 +117,36 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na + +{% if env == 'pagure-staging' %} + ServerName docs.stg.pagure.org +{% else %} + ServerName docs.pagure.org +{% endif %} + + WSGIScriptAlias / /var/www/docs_pagure.wsgi + + 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 + + Alias /static /usr/lib/python2.7/site-packages/pagure/static/ + + + WSGIProcessGroup paguredocs + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + + diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/frontend/templates/pagure.cfg index 0b1f4747cb..c0c7101675 100644 --- a/roles/pagure/frontend/templates/pagure.cfg +++ b/roles/pagure/frontend/templates/pagure.cfg @@ -45,8 +45,8 @@ DOC_APP_URL = 'https://docs.pagure.org' ### The URL to use to clone git repositories. {% if env == 'pagure-staging' %} -GIT_URL_SSH = 'git@stg.pagure.io' -GIT_URL_GIT = 'https://stg.pagure.io' +GIT_URL_SSH = 'ssh://git@stg.pagure.io/' +GIT_URL_GIT = 'https://stg.pagure.io/' {% else %} GIT_URL_SSH = 'git@pagure.io' GIT_URL_GIT = 'https://pagure.io'