Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source 
* 'master' of /git/ansible:
  Move pagure.io above pagure.org to server pagure.io SSL ceret by default
  Add the trailing slash to fix the links in the new version of pagure
This commit is contained in:
Adam Miller 2015-08-05 15:59:15 +00:00
commit f887d1ec08
2 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

71
roles/pagure/frontend/templates/0_pagure.conf
View file

@ -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
<VirtualHost *:80>
{% if env == 'pagure-staging' %}
ServerName stg.pagure.io
@ -16,7 +18,6 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
{% endif %}
</VirtualHost>
<VirtualHost *:80>
{% 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 %}
</VirtualHost>
<VirtualHost *:443>
{% 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/
<Location />
WSGIProcessGroup paguredocs
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order deny,allow
Allow from all
</IfModule>
</Location>
</VirtualHost>
## End of redirects http -> https
<VirtualHost *:443>
@ -149,3 +117,36 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na
</VirtualHost>
<VirtualHost *:443>
{% 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/
<Location />
WSGIProcessGroup paguredocs
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order deny,allow
Allow from all
</IfModule>
</Location>
</VirtualHost>

4
roles/pagure/frontend/templates/pagure.cfg
View file

@ -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'