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

Use https on copr-dev

Browse source
This commit is contained in:
Jakub Kadlčík 2019-03-18 11:05:34 +01:00
parent 15a359ad8a
commit ab9b427ba9
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/copr-dev
View file

@ -10,7 +10,7 @@ keygen_host: "172.25.33.46"
resolvconf: "resolv.conf/cloud"
backend_base_url: "http://copr-be-dev.cloud.fedoraproject.org"
backend_base_url: "https://copr-be-dev.cloud.fedoraproject.org"
postfix_maincf: "postfix/main.cf/main.cf.copr"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"

2
inventory/group_vars/copr-stg
View file

@ -8,7 +8,7 @@ _forward_src: "forward_dev"
copr_backend_ips: ["172.25.33.49", "209.132.184.44"]
keygen_host: "172.25.33.51"
backend_base_url: "http://copr-be-stg.fedorainfracloud.org"
backend_base_url: "https://copr-be-stg.fedorainfracloud.org"
frontend_base_url: "https://copr.stg.fedoraproject.org"
dist_git_base_url: "copr-dist-git-stg.fedorainfracloud.org"

6
roles/copr/frontend-cloud/templates/copr.conf
View file

@ -57,7 +57,7 @@ INTRANET_IPS = {{ copr_backend_ips }}
REPO_GPGCHECK = {% if devel %} 0 {% else %} 1 {% endif %}
{% if env == 'staging' %}
PUBLIC_COPR_BASE_URL = "http://copr-fe-dev.cloud.fedoraproject.org"
PUBLIC_COPR_BASE_URL = "https://copr-fe-dev.cloud.fedoraproject.org"
{% else %}
PUBLIC_COPR_BASE_URL = "https://copr.fedorainfracloud.org"
{% endif %}
@ -74,8 +74,8 @@ FEDMENU_DATA_URL = "https://apps.fedoraproject.org/js/data.js"
# todo: check that ansible variable is used correctly
{% if env == 'staging' %}
ENFORCE_PROTOCOL_FOR_BACKEND_URL = "http"
ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http"
ENFORCE_PROTOCOL_FOR_BACKEND_URL = "https"
ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "https"
{% else %}
ENFORCE_PROTOCOL_FOR_BACKEND_URL = "https"
ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "https"