From b78c9c26289e9f3ca822492141fa33d398d12436 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 18 May 2017 18:58:24 +0000 Subject: [PATCH] changing instance name and session cookie name for upstreamfirst pagure --- inventory/host_vars/upstreamfirst.fedorainfracloud.org | 3 ++- roles/pagure/upstreamfirst-frontend/defaults/main.yml | 2 ++ roles/pagure/upstreamfirst-frontend/templates/pagure.cfg | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 roles/pagure/upstreamfirst-frontend/defaults/main.yml diff --git a/inventory/host_vars/upstreamfirst.fedorainfracloud.org b/inventory/host_vars/upstreamfirst.fedorainfracloud.org index 9aa5bbf9a3..9fc6bb1f7d 100644 --- a/inventory/host_vars/upstreamfirst.fedorainfracloud.org +++ b/inventory/host_vars/upstreamfirst.fedorainfracloud.org @@ -7,7 +7,6 @@ instance_type: m1.medium image: CentOS-7-x86_64-GenericCloud-1503 keypair: fedora-admin-20130801 -security_group: default # NOTE: security_group MUST contain default. zone: nova inventory_tenant: persistent @@ -79,6 +78,8 @@ pagure_ssh_host_sha256: 'SHA256:ggRdzg+ugyR6WIzeiuyASAdEHf+HG5yZqJJIu/YTtHI=' new_pagure_admin_groups: ['sysadmin-main', 'sysadmin-qa'] +pagure_instance_name: "{{ pagure_instance_name }}" + stunnel_service: "eventsource" stunnel_source_port: 8088 stunnel_destination_port: 8080 diff --git a/roles/pagure/upstreamfirst-frontend/defaults/main.yml b/roles/pagure/upstreamfirst-frontend/defaults/main.yml new file mode 100644 index 0000000000..a9e248fb02 --- /dev/null +++ b/roles/pagure/upstreamfirst-frontend/defaults/main.yml @@ -0,0 +1,2 @@ +--- +pagure_instance_name: "Pagure" diff --git a/roles/pagure/upstreamfirst-frontend/templates/pagure.cfg b/roles/pagure/upstreamfirst-frontend/templates/pagure.cfg index db3c79e68d..eac700089e 100644 --- a/roles/pagure/upstreamfirst-frontend/templates/pagure.cfg +++ b/roles/pagure/upstreamfirst-frontend/templates/pagure.cfg @@ -1,5 +1,7 @@ from datetime import timedelta +INSTANCE_NAME= {{ pagure_instance_name }} + ### Set the time after which the admin session expires # There are two sessions on pagure, login that holds for 31 days and # the session defined here after which an user has to re-login. @@ -151,7 +153,7 @@ SESSION_COOKIE_SECURE = True # The name of the cookie used to store the session id. # Default: ``.pagure``. -SESSION_COOKIE_NAME = 'pagure' +SESSION_COOKIE_NAME = 'upstreamfirstpagure' # Boolean specifying wether to check the user's IP address when retrieving # its session. This make things more secure (thus is on by default) but