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

fedoca: fix the configurations for the new url and secret location

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2021-01-29 14:03:03 +01:00
parent 065a4a60a9
commit d4998f2e25
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openshift-apps/fedocal/templates/client_secrets.json
View file

@ -9,7 +9,7 @@
{% endif %} {% endif %}
"issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/", "issuer": "https://id{{env_suffix}}.fedoraproject.org/openidc/",
"redirect_uris": [ "redirect_uris": [
"https://elections{{env_suffix}}.fedoraproject.org/oidc_callback" "https://calendar{{env_suffix}}.fedoraproject.org/oidc_callback"
], ],
"token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token", "token_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/Token",
"userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo" "userinfo_uri": "https://id{{env_suffix}}.fedoraproject.org/openidc/UserInfo"

27
roles/openshift-apps/fedocal/templates/fedocal.cfg
View file

@ -14,6 +14,8 @@ DB_URL='postgresql://{{ fedocal_db_user }}:{{ fedocal_db_pass }}@db01.iad2.fedor
{% endif %} {% endif %}
OIDC_CLIENT_SECRETS = '/opt/app-root/secret/client_secrets.json'
### The FAS group in which the admin of fedocal are ### The FAS group in which the admin of fedocal are
ADMIN_GROUP='sysadmin-calendar' ADMIN_GROUP='sysadmin-calendar'
@ -39,28 +41,19 @@ PREFERRED_URL_SCHEME='https'
# Make browsers send session cookie only via HTTPS # Make browsers send session cookie only via HTTPS
SESSION_COOKIE_SECURE = True SESSION_COOKIE_SECURE = True
SESSION_COOKIE_PATH = '/calendar' SESSION_COOKIE_PATH = '/'
SESSION_COOKIE_NAME = 'fedocal' SESSION_COOKIE_NAME = 'fedocal'
# Used by SESSION_COOKIE_PATH # Used by SESSION_COOKIE_PATH
APPLICATION_ROOT = '/calendar/' APPLICATION_ROOT = '/'
{% if env == 'staging' %} {% if env == 'staging' %}
APP_URL = 'https://apps.stg.fedoraproject.org/' + APPLICATION_ROOT APP_URL = 'https://calendar.stg.fedoraproject.org/' + APPLICATION_ROOT
FAS_OPENID_ENDPOINT = 'https://id.stg.fedoraproject.org/openid/' FAS_OPENID_ENDPOINT = 'https://id.stg.fedoraproject.org/openid/'
SITE_ROOT = 'https://apps.stg.fedoraproject.org' SITE_ROOT = 'https://calendar.stg.fedoraproject.org'
SITE_URL = '%s/calendar' % SITE_ROOT SITE_URL = '%s/' % SITE_ROOT
{% else %} {% else %}
APP_URL = 'https://apps.fedoraproject.org/' + APPLICATION_ROOT APP_URL = 'https://calendar.fedoraproject.org/' + APPLICATION_ROOT
SITE_ROOT = 'https://apps.fedoraproject.org' SITE_ROOT = 'https://calendar.fedoraproject.org'
SITE_URL = '%s/calendar' % SITE_ROOT SITE_URL = '%s/' % SITE_ROOT
{% endif %}
## URLs to fedmenu resources
{% if env == 'staging' %}
FEDMENU_URL = 'https://apps.stg.fedoraproject.org/fedmenu'
FEDMENU_DATA_URL = 'https://apps.stg.fedoraproject.org/js/data.js'
{% else %}
FEDMENU_URL = 'https://apps.fedoraproject.org/fedmenu'
FEDMENU_DATA_URL = 'https://apps.fedoraproject.org/js/data.js'
{% endif %} {% endif %}