diff --git a/roles/pagure/frontend/files/0_pagure.conf b/roles/pagure/frontend/files/0_pagure.conf index 7e2c0bd045..15b4fb029b 100644 --- a/roles/pagure/frontend/files/0_pagure.conf +++ b/roles/pagure/frontend/files/0_pagure.conf @@ -15,3 +15,33 @@ SSLCertificateChainFile /etc/pki/tls/certs/pagure.io.intermediate.cert SSLCertificateKeyFile /etc/pki/tls/certs/pagure.io.key + + +#TODO: move this to 443 when we have the ssl certs + + + WSGIDaemonProcess pagure user=git group=git maximum-requests=50000 display-name=pagure processes=8 threads=4 ina +tivity-timeout=300 + + WSGISocketPrefix run/wsgi + WSGIRestrictStdout On + WSGIRestrictSignal Off + WSGIPythonOptimize 1 + + WSGIScriptAlias / /usr/share/pagure/doc_pagure.wsgi + + + WSGIProcessGroup pagure + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + + + + diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml index 0263f7250b..3831df9c2d 100644 --- a/roles/pagure/frontend/tasks/main.yml +++ b/roles/pagure/frontend/tasks/main.yml @@ -235,9 +235,12 @@ - restart apache - name: Install the wsgi file - template: src=pagure.wsgi - dest=/var/www/pagure.wsgi + template: src={{ item }} + dest=/var/www/{{ item }} owner=git group=git mode=0644 + with_items: + - pagure.wsgi + - docs_pagure.wsgi tags: - config - web diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/frontend/templates/pagure.cfg index 4ec93ab343..88780f6e8c 100644 --- a/roles/pagure/frontend/templates/pagure.cfg +++ b/roles/pagure/frontend/templates/pagure.cfg @@ -37,8 +37,10 @@ DOMAIN_EMAIL_NOTIFICATIONS = 'pagure.io' ### The URL at which the project is available. {% if env == 'pagure-staging' %} APP_URL = 'https://stg.pagure.io/' +DOC_APP_URL = 'http://docs.stg.pagure.org' {% else %} APP_URL = 'https://pagure.io/' +DOC_APP_URL = 'https://docs.pagure.org' {% endif %} ### The URL to use to clone git repositories.