WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-03-20 03:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use env_prefix not env_suffix

Browse Source
This commit is contained in:
Mikolaj Izdebski
2018-08-27 20:13:01 +00:00
parent 4b511a2c70
commit 3abf9194b0
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/copr/frontend/templates/copr.conf
View File

@@ -48,8 +48,8 @@ REPO_GPGCHECK = 1
PUBLIC_COPR_BASE_URL = "https://{{ copr_frontend_public_hostname }}"
# URLs for fedmenu
FEDMENU_URL = "https://apps{{ env_prefix }}.fedoraproject.org/fedmenu/"
FEDMENU_DATA_URL = "https://apps{{ env_prefix }}.fedoraproject.org/js/data.js"
FEDMENU_URL = "https://apps{{ env_suffix }}.fedoraproject.org/fedmenu/"
FEDMENU_DATA_URL = "https://apps{{ env_suffix }}.fedoraproject.org/js/data.js"
ENFORCE_PROTOCOL_FOR_BACKEND_URL = "https"
ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "https"

9
roles/koschei/frontend/templates/config-frontend.cfg.j2
View File

@@ -2,7 +2,6 @@
# configuration in /usr/share/koschei/config.cfg. It is a python file expecting
# assignment to config dictionary which will be recursively merged with the
# default one.
{% set env_prefix = ".stg" if env == "staging" else "" %}
config = {
"database_config": {
"host": "{{ koschei_pgsql_hostname }}",
@@ -56,7 +55,7 @@ config = {
},
},
"pagure": {
"api_url": "https://src{{ env_prefix }}.fedoraproject.org/api/0",
"api_url": "https://src{{ env_suffix }}.fedoraproject.org/api/0",
},
"frontend": {
"builds_per_page": 8,
@@ -70,11 +69,11 @@ config = {
},
"links": [
{"name": "Packages",
"url": "https://apps{{ env_prefix }}.fedoraproject.org/packages/{package.name}"},
"url": "https://apps{{ env_suffix }}.fedoraproject.org/packages/{package.name}"},
{"name": "Bodhi",
"url": "https://bodhi{{ env_prefix }}.fedoraproject.org/updates?packages={package.name}"},
"url": "https://bodhi{{ env_suffix }}.fedoraproject.org/updates?packages={package.name}"},
{"name": "Dist-git",
"url": "https://src{{ env_prefix }}.fedoraproject.org/rpms/{package.name}"},
"url": "https://src{{ env_suffix }}.fedoraproject.org/rpms/{package.name}"},
{"name": "Bugzilla",
"url": "https://{{ koschei_bugzilla }}/buglist.cgi?product={package.collection.bugzilla_product}&component={package.name}"},
{"name": "Koji",