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

Adjust pagure's config to be deployed in / rather than /pagure

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2017-08-03 15:50:19 +02:00
parent f2015d75e1
commit cf54ffd3e2
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roles/distgit/pagure/templates/pagure.cfg
View file

@ -33,17 +33,17 @@ SMTP_SERVER = 'bastion'
### Email used to sent emails ### Email used to sent emails
{% if env == 'staging' %} {% if env == 'staging' %}
FROM_EMAIL = 'pagure@pkgs.stg.fedoraproject.org' FROM_EMAIL = 'pagure@pkgs.stg.fedoraproject.org'
DOMAIN_EMAIL_NOTIFICATIONS = 'pkgs.stg.fedoraproject.org' DOMAIN_EMAIL_NOTIFICATIONS = 'src.stg.fedoraproject.org'
{% else %} {% else %}
FROM_EMAIL = 'pagure@pkgs.fedoraproject.org' FROM_EMAIL = 'pagure@pkgs.fedoraproject.org'
DOMAIN_EMAIL_NOTIFICATIONS = 'pkgs.fedoraproject.org' DOMAIN_EMAIL_NOTIFICATIONS = 'src.fedoraproject.org'
{% endif %} {% endif %}
### The URL at which the project is available. ### The URL at which the project is available.
{% if env == 'staging' %} {% if env == 'staging' %}
APP_URL = 'https://pkgs.stg.fedoraproject.org/pagure/' APP_URL = 'https://src.stg.fedoraproject.org/'
{% else %} {% else %}
APP_URL = 'https://pkgs.fedoraproject.org/pagure/' APP_URL = 'https://src.fedoraproject.org/'
{% endif %} {% endif %}
### Datagrepper info for the user profile ### Datagrepper info for the user profile
@ -57,10 +57,10 @@ DATAGREPPER_CATEGORY = 'pagure'
### The URL to use to clone git repositories. ### The URL to use to clone git repositories.
{% if env == 'staging' %} {% if env == 'staging' %}
GIT_URL_SSH = 'ssh://pkgs.stg.fedoraproject.org/' GIT_URL_SSH = 'ssh://pkgs.stg.fedoraproject.org/'
GIT_URL_GIT = 'https://pkgs.stg.fedoraproject.org/' GIT_URL_GIT = 'https://src.stg.fedoraproject.org/'
{% else %} {% else %}
GIT_URL_SSH = 'ssh://pkgs.fedoraproject.org/' GIT_URL_SSH = 'ssh://pkgs.fedoraproject.org/'
GIT_URL_GIT = 'https://pkgs.fedoraproject.org/' GIT_URL_GIT = 'https://src.fedoraproject.org/'
{% endif %} {% endif %}
### The IP addresses allowed for the internal endpoints ### The IP addresses allowed for the internal endpoints
@ -72,9 +72,9 @@ IP_ALLOWED_INTERNAL = ['127.0.0.1', 'localhost', '::1', '140.211.169.204']
# Redis configuration # Redis configuration
{% if env == 'staging' %} {% if env == 'staging' %}
#EVENTSOURCE_SOURCE = 'https://pkgs.stg.fedoraproject.org:8088' #EVENTSOURCE_SOURCE = 'https://src.stg.fedoraproject.org:8088'
{% else %} {% else %}
#EVENTSOURCE_SOURCE = 'https://pkgs.stg.fedoraproject.org:8088' #EVENTSOURCE_SOURCE = 'https://src.stg.fedoraproject.org:8088'
{% endif %} {% endif %}
REDIS_HOST = '0.0.0.0' REDIS_HOST = '0.0.0.0'
REDIS_PORT = 6379 REDIS_PORT = 6379
@ -153,7 +153,7 @@ SESSION_COOKIE_NAME = 'disgit_pagure'
CHECK_SESSION_IP = True CHECK_SESSION_IP = True
# Used by SESSION_COOKIE_PATH # Used by SESSION_COOKIE_PATH
APPLICATION_ROOT = '/pagure' APPLICATION_ROOT = '/'
# Set the SSH certs/keys # Set the SSH certs/keys
{% if env == 'staging' %} {% if env == 'staging' %}