diff --git a/inventory/group_vars/copr-dev b/inventory/group_vars/copr-dev index baa3240258..b09e86b4ff 100644 --- a/inventory/group_vars/copr-dev +++ b/inventory/group_vars/copr-dev @@ -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" diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg index 0bee972860..02fca5b4ab 100644 --- a/inventory/group_vars/copr-stg +++ b/inventory/group_vars/copr-stg @@ -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" diff --git a/roles/copr/frontend-cloud/templates/copr.conf b/roles/copr/frontend-cloud/templates/copr.conf index ed0a3ab4d4..f6316696f0 100644 --- a/roles/copr/frontend-cloud/templates/copr.conf +++ b/roles/copr/frontend-cloud/templates/copr.conf @@ -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"