From cf54ffd3e2478694aef7de5875737c9a34653b10 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 3 Aug 2017 15:50:19 +0200 Subject: [PATCH] Adjust pagure's config to be deployed in / rather than /pagure Signed-off-by: Pierre-Yves Chibon --- roles/distgit/pagure/templates/pagure.cfg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg index f9ae6110cf..44f294055d 100644 --- a/roles/distgit/pagure/templates/pagure.cfg +++ b/roles/distgit/pagure/templates/pagure.cfg @@ -33,17 +33,17 @@ SMTP_SERVER = 'bastion' ### Email used to sent emails {% if env == 'staging' %} FROM_EMAIL = 'pagure@pkgs.stg.fedoraproject.org' -DOMAIN_EMAIL_NOTIFICATIONS = 'pkgs.stg.fedoraproject.org' +DOMAIN_EMAIL_NOTIFICATIONS = 'src.stg.fedoraproject.org' {% else %} FROM_EMAIL = 'pagure@pkgs.fedoraproject.org' -DOMAIN_EMAIL_NOTIFICATIONS = 'pkgs.fedoraproject.org' +DOMAIN_EMAIL_NOTIFICATIONS = 'src.fedoraproject.org' {% endif %} ### The URL at which the project is available. {% if env == 'staging' %} -APP_URL = 'https://pkgs.stg.fedoraproject.org/pagure/' +APP_URL = 'https://src.stg.fedoraproject.org/' {% else %} -APP_URL = 'https://pkgs.fedoraproject.org/pagure/' +APP_URL = 'https://src.fedoraproject.org/' {% endif %} ### Datagrepper info for the user profile @@ -57,10 +57,10 @@ DATAGREPPER_CATEGORY = 'pagure' ### The URL to use to clone git repositories. {% if env == 'staging' %} 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 %} GIT_URL_SSH = 'ssh://pkgs.fedoraproject.org/' -GIT_URL_GIT = 'https://pkgs.fedoraproject.org/' +GIT_URL_GIT = 'https://src.fedoraproject.org/' {% endif %} ### 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 {% if env == 'staging' %} -#EVENTSOURCE_SOURCE = 'https://pkgs.stg.fedoraproject.org:8088' +#EVENTSOURCE_SOURCE = 'https://src.stg.fedoraproject.org:8088' {% else %} -#EVENTSOURCE_SOURCE = 'https://pkgs.stg.fedoraproject.org:8088' +#EVENTSOURCE_SOURCE = 'https://src.stg.fedoraproject.org:8088' {% endif %} REDIS_HOST = '0.0.0.0' REDIS_PORT = 6379 @@ -153,7 +153,7 @@ SESSION_COOKIE_NAME = 'disgit_pagure' CHECK_SESSION_IP = True # Used by SESSION_COOKIE_PATH -APPLICATION_ROOT = '/pagure' +APPLICATION_ROOT = '/' # Set the SSH certs/keys {% if env == 'staging' %}