[ansible] Fix typo
by Nicolas Chauvet
commit 322f163adb31340a78e76944f85c30c2b689ac82
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 13 11:03:26 2020 +0100
Fix typo
inventory/group_vars/buildarm | 4 ++--
inventory/group_vars/builders | 6 +++---
inventory/group_vars/buildhw | 6 +++---
inventory/group_vars/buildhw_aarch64 | 4 ++--
inventory/group_vars/buildhw_armv7 | 4 ++--
inventory/group_vars/buildvm | 6 +++---
inventory/group_vars/buildvm_aarch64 | 4 ++--
inventory/group_vars/buildvm_ppc64 | 4 ++--
inventory/group_vars/buildvm_ppc64le | 4 ++--
inventory/group_vars/releng_compose | 6 +++---
playbooks/groups/osbs-master.yml | 8 ++++----
roles/bodhi2/backend/templates/mash.conf | 2 +-
roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 | 6 +++---
roles/bodhi2/base/templates/production.ini.j2 | 2 +-
roles/koji_hub/files/kojira.conf | 2 +-
roles/koji_hub/templates/hub.conf.j2 | 2 +-
roles/koji_hub/templates/web.conf.j2 | 4 ++--
roles/pkgdb2/templates/pkgdb2.cfg | 2 +-
roles/robosignatory/files/koji.conf | 4 ++--
roles/sigul/bridge/files/koji-primary.conf | 4 ++--
20 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 0f385bf..2756f5c 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -5,9 +5,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/builders b/inventory/group_vars/builders
index deea21e..3f9c2e1 100644
--- a/inventory/group_vars/builders
+++ b/inventory/group_vars/builders
@@ -6,9 +6,9 @@ fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
-koji_weburl: "https://koji.rpmfusion.org.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org/koji"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
csi_security_category: High
csi_primary_contact: RPM Fusion Admins - sysadmin(a)lists.rpmfusion.org
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index 9b85f3e..e2796c6 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -5,9 +5,9 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"
freezes: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
-koji_weburl: "https://koji.rpmfusion.org.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org/koji"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildhw_aarch64 b/inventory/group_vars/buildhw_aarch64
index 0b2ba31..1325793 100644
--- a/inventory/group_vars/buildhw_aarch64
+++ b/inventory/group_vars/buildhw_aarch64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildhw_armv7 b/inventory/group_vars/buildhw_armv7
index 0f385bf..2756f5c 100644
--- a/inventory/group_vars/buildhw_armv7
+++ b/inventory/group_vars/buildhw_armv7
@@ -5,9 +5,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index 7b52a27..73c8fbd 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -18,9 +18,9 @@ fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
-koji_weburl: "https://koji.rpmfusion.org.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org/koji"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
csi_security_category: High
csi_primary_contact: RPM Fusion Admins - sysadmin(a)lists.rpmfusion.org
diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index 0b2ba31..1325793 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm_ppc64 b/inventory/group_vars/buildvm_ppc64
index 0b2ba31..1325793 100644
--- a/inventory/group_vars/buildvm_ppc64
+++ b/inventory/group_vars/buildvm_ppc64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le
index 0b2ba31..1325793 100644
--- a/inventory/group_vars/buildvm_ppc64le
+++ b/inventory/group_vars/buildvm_ppc64le
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose
index d46e4c3..0c9575e 100644
--- a/inventory/group_vars/releng_compose
+++ b/inventory/group_vars/releng_compose
@@ -24,9 +24,9 @@ kojihub_url: koji.rpmfusion.org/kojihub
kojihub_scheme: http
# for kojid config
-koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
-koji_weburl: "https://koji.rpmfusion.org.org/koji"
-koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org/koji"
+koji_topurl: "https://koji.rpmfusion.org/kojifiles"
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 3d44e67..b446150 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -159,8 +159,8 @@
registry_uri: 'https://registry.stg.rpmfusion.org/v2',
source_registry_uri: 'https://registry.stg.rpmfusion.org/v2',
build_host: 'osbs.stg.rpmfusion.org',
- koji_root: 'https://koji.rpmfusion.org.org/koji',
- koji_hub: 'https://koji.rpmfusion.org.org/kojihub',
+ koji_root: 'https://koji.rpmfusion.org/koji',
+ koji_hub: 'https://koji.rpmfusion.org/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
@@ -189,8 +189,8 @@
registry_uri: 'https://osbs.rpmfusion.org/v2',
source_registry_uri: 'https://osbs.rpmfusion.org/v2',
build_host: 'osbs.rpmfusion.org',
- koji_root: 'https://koji.rpmfusion.org.org/koji',
- koji_hub: 'https://koji.rpmfusion.org.org/kojihub',
+ koji_root: 'https://koji.rpmfusion.org/koji',
+ koji_hub: 'https://koji.rpmfusion.org/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
diff --git a/roles/bodhi2/backend/templates/mash.conf b/roles/bodhi2/backend/templates/mash.conf
index a22c3fa..288fefa 100644
--- a/roles/bodhi2/backend/templates/mash.conf
+++ b/roles/bodhi2/backend/templates/mash.conf
@@ -1,5 +1,5 @@
[defaults]
-buildhost = https://koji.rpmfusion.org.org/kojihub
+buildhost = https://koji.rpmfusion.org/kojihub
symlink = False
configdir = /etc/bodhi/
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index cad4b55..6d6ed8c 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -39,8 +39,8 @@ def usage():
def get_options():
# shamelessly stolen from koji CLI
opts = {
- 'server': 'https://koji.rpmfusion.org.org/kojihub',
- 'weburl': 'https://koji.rpmfusion.org.org/koji',
+ 'server': 'https://koji.rpmfusion.org/kojihub',
+ 'weburl': 'https://koji.rpmfusion.org/koji',
'cert': '/etc/pki/pkgdb/pkgdb.pem',
'ca': '/etc/pki/pkgdb/rpmfusion-upload-ca.cert',
'serverca': '/etc/pki/pkgdb/rpmfusion-server-ca.cert'
@@ -126,7 +126,7 @@ if __name__ == '__main__':
for arch in arches:
if arch == "primary":
- session = koji.ClientSession("https://koji.rpmfusion.org.org/kojihub")
+ session = koji.ClientSession("https://koji.rpmfusion.org/kojihub")
else:
session = koji.ClientSession("http://%s.koji.rpmfusion.org/kojihub" % arch)
try:
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 22b2a29..8bb7147 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -237,7 +237,7 @@ buildsystem = koji
koji_hub = https://koji.rpmfusion.org/kojihub
# Root url of the Koji instance to point to. No trailing slash
-koji_url = https://koji.rpmfusion.org.org
+koji_url = https://koji.rpmfusion.org
# URL of where users should go to set up their notifications
#fmn_url = https://apps.rpmfusion.org/notifications/
diff --git a/roles/koji_hub/files/kojira.conf b/roles/koji_hub/files/kojira.conf
index 5c7e93e..39990d7 100644
--- a/roles/koji_hub/files/kojira.conf
+++ b/roles/koji_hub/files/kojira.conf
@@ -10,7 +10,7 @@
; keytab=/etc/kojira.keytab
; The URL for the koji hub server
-server=https://koji.rpmfusion.org.org/kojihub
+server=https://koji.rpmfusion.org/kojihub
; The directory containing the repos/ directory
topdir=/mnt/koji
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 4cef151..1293341 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -31,7 +31,7 @@ ProxyDNs = emailAddress=rpmfusion-buildsys(a)rpmfusion.org,CN=kojiweb,O=RPM Fusion
## Other options ##
LoginCreatesUser = On
{% if inventory_hostname.startswith('koji') %}
-KojiWebURL = https://koji.rpmfusion.org.org/koji
+KojiWebURL = https://koji.rpmfusion.org/koji
{% elif inventory_hostname.startswith('arm-koji') %}
KojiWebURL = http://arm.koji.rpmfusion.org/koji
{% endif %}
diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2
index 1cfca1f..c4b9357 100644
--- a/roles/koji_hub/templates/web.conf.j2
+++ b/roles/koji_hub/templates/web.conf.j2
@@ -13,8 +13,8 @@ KojiFilesURL = http://s390.koji.rpmfusion.org/kojifiles
KojiHubURL = http://arm.koji.rpmfusion.org/kojihub
KojiFilesURL = http://arm.koji.rpmfusion.org/kojifiles
{% else %}
-KojiHubURL = https://koji.rpmfusion.org.org/kojihub
-KojiFilesURL = https://koji.rpmfusion.org.org/kojifiles
+KojiHubURL = https://koji.rpmfusion.org/kojihub
+KojiFilesURL = https://koji.rpmfusion.org/kojifiles
{% endif %}
# SSL authentication options
diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg
index 53d54aa..5c8e048 100644
--- a/roles/pkgdb2/templates/pkgdb2.cfg
+++ b/roles/pkgdb2/templates/pkgdb2.cfg
@@ -204,6 +204,6 @@ PKGS_BUG_URL = 'https://bugzilla.rpmfusion.org/buglist.cgi?query_format=specific
PKGS_PKG_URL = 'http://rpmfusion.org/Package/%s'
CGIT_URL = 'https://pkgs.rpmfusion.org/cgit/?q=%s'
BODHI_URL = 'https://admin.rpmfusion.org/updates/?packages=%s'
-KOJI_URL = 'https://koji.rpmfusion.org.org/koji/search?'\
+KOJI_URL = 'https://koji.rpmfusion.org/koji/search?'\
'type=package&match=glob&terms=%s'
PKGDB2_ANITYA_DISTRO='RPM Fusion'
diff --git a/roles/robosignatory/files/koji.conf b/roles/robosignatory/files/koji.conf
index fcb5e33..e94514e 100644
--- a/roles/robosignatory/files/koji.conf
+++ b/roles/robosignatory/files/koji.conf
@@ -1,6 +1,6 @@
[koji]
-server = https://koji.rpmfusion.org.org/kojihub
-weburl = https://koji.rpmfusion.org.org/koji
+server = https://koji.rpmfusion.org/kojihub
+weburl = https://koji.rpmfusion.org/koji
topurl = https://kojipkgs.rpmfusion.org/
anon_retry = false
cert = /etc/robosignatory/koji.cert
diff --git a/roles/sigul/bridge/files/koji-primary.conf b/roles/sigul/bridge/files/koji-primary.conf
index cf0f73c..e760ffe 100644
--- a/roles/sigul/bridge/files/koji-primary.conf
+++ b/roles/sigul/bridge/files/koji-primary.conf
@@ -3,10 +3,10 @@
;configuration for koji cli tool
;url of XMLRPC server
-server = https://koji.rpmfusion.org.org/kojihub
+server = https://koji.rpmfusion.org/kojihub
;url of web interface
-weburl = https://koji.rpmfusion.org.org/koji
+weburl = https://koji.rpmfusion.org/koji
;url of package download site
topurl = https://koji.rpmfusion.org/kojifiles
4 years, 1 month
- 1
- 0
[ansible] Drop ca and deprecate serverca usage
by Nicolas Chauvet
commit b31eaa42bae19f04a0866a65c6db6abdac1aa784
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 13 10:35:56 2020 +0100
Drop ca and deprecate serverca usage
roles/bodhi2/backend/files/koji-config | 5 +----
.../templates/bodhi-masher-jobrunner.cfg.j2 | 2 +-
roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 | 3 ++-
roles/koji_builder/templates/koji.conf | 5 +----
roles/koji_builder/templates/kojid.conf | 5 +----
roles/koji_hub/files/koji-gc.conf | 2 +-
roles/koji_hub/files/kojira.conf | 5 +----
roles/sigul/bridge/files/koji-primary.conf | 4 +---
8 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/roles/bodhi2/backend/files/koji-config b/roles/bodhi2/backend/files/koji-config
index 2e8afcb..e003655 100644
--- a/roles/bodhi2/backend/files/koji-config
+++ b/roles/bodhi2/backend/files/koji-config
@@ -2,8 +2,5 @@
;client certificate
cert = /etc/pki/pkgdb/pkgdb.pem
-;certificate of the CA that issued the client certificate
-ca = /etc/pki/pkgdb/fedora-server-ca.cert
-
;certificate of the CA that issued the HTTP server certificate
-serverca = /etc/pki/pkgdb/fedora-server-ca.cert
+;serverca = /etc/pki/pkgdb/fedora-server-ca.cert
diff --git a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2 b/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2
index 4e1fa33..af51d3c 100644
--- a/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2
+++ b/roles/bodhi2/backend/templates/bodhi-masher-jobrunner.cfg.j2
@@ -97,7 +97,7 @@ pkgdb_url = 'https://admin.rpmfusion.org/pkgdb'
buildsystem = 'koji'
client_cert = '/etc/pki/bodhi/bodhi.pem'
clientca_cert = '/etc/pki/bodhi/fedora-upload-ca.cert'
-serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert'
+#serverca_cert = '/etc/pki/bodhi/fedora-server-ca.cert'
masher_lock_id = 'FEDORA'
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 356bbeb..cad4b55 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -130,7 +130,8 @@ if __name__ == '__main__':
else:
session = koji.ClientSession("http://%s.koji.rpmfusion.org/kojihub" % arch)
try:
- session.ssl_login(options['cert'], options['ca'], options['serverca'])
+ #session.ssl_login(options['cert'], options['ca'], options['serverca'])
+ session.ssl_login(options['cert'], options['ca'])
except:
print "Unable to sync to %s hub" % arch
continue
diff --git a/roles/koji_builder/templates/koji.conf b/roles/koji_builder/templates/koji.conf
index f4fcfd5..f28ea24 100644
--- a/roles/koji_builder/templates/koji.conf
+++ b/roles/koji_builder/templates/koji.conf
@@ -24,8 +24,5 @@ topurl = {{ koji_topurl }}
;client certificate
cert = ~/.fedora.cert
-;certificate of the CA that issued the client certificate
-ca = ~/.fedora-server-ca.cert
-
;certificate of the CA that issued the HTTP server certificate
-serverca = ~/.fedora-server-ca.cert
+;serverca = ~/.fedora-server-ca.cert
diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 1a60b48..e3b09a7 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -79,11 +79,8 @@ from_addr=RPM Fusion Koji Build System <buildsys(a)rpmfusion.org>
;client certificate - puppet generated
cert = /etc/kojid/kojibuilder.pem
-;certificate of the CA that issued the client certificate
-ca = /etc/kojid/cacert.pem
-
;certificate of the CA that issued the HTTP server certificate
-serverca = /etc/kojid/cacert.pem
+;serverca = /etc/kojid/cacert.pem
{% if 'runroot' in group_names %}
; Config for it lives in /etc/kojid/runroot.conf
diff --git a/roles/koji_hub/files/koji-gc.conf b/roles/koji_hub/files/koji-gc.conf
index 1f9d431..f37f91f 100644
--- a/roles/koji_hub/files/koji-gc.conf
+++ b/roles/koji_hub/files/koji-gc.conf
@@ -55,7 +55,7 @@ unprotected_keys =
fedora-el-8-nonfree
server = https://koji.rpmfusion.org/kojihub
-serverca = /etc/koji-gc/serverca.crt
+#serverca = /etc/koji-gc/serverca.crt
weburl = https://koji.rpmfusion.org/koji
from_addr = RPM Fusion Koji Build System <buildsys(a)rpmfusion.org>
email-domain = rpmfusion.org
diff --git a/roles/koji_hub/files/kojira.conf b/roles/koji_hub/files/kojira.conf
index 56d51fe..5c7e93e 100644
--- a/roles/koji_hub/files/kojira.conf
+++ b/roles/koji_hub/files/kojira.conf
@@ -33,8 +33,5 @@ max_repo_tasks=6
;client certificate
cert = /etc/kojira/kojira_cert_key.pem
-;certificate of the CA that issued the client certificate
-ca = /etc/kojira/extras_cacert.pem
-
;certificate of the CA that issued the HTTP server certificate
-serverca = /etc/kojira/extras_cacert.pem
+;serverca = /etc/kojira/extras_cacert.pem
diff --git a/roles/sigul/bridge/files/koji-primary.conf b/roles/sigul/bridge/files/koji-primary.conf
index e04fa9c..cf0f73c 100644
--- a/roles/sigul/bridge/files/koji-primary.conf
+++ b/roles/sigul/bridge/files/koji-primary.conf
@@ -21,8 +21,6 @@ authtype = ssl
;client certificate
cert = /etc/sigul/rpmfusion.cert
-ca = /etc/sigul/rpmfusion-upload-ca.cert
-
;certificate of the CA that issued the HTTP server certificate
-serverca = /etc/sigul/rpmfusion-server-ca.cert
+;serverca = /etc/sigul/rpmfusion-server-ca.cert
4 years, 1 month
- 1
- 0
[ansible] Switch koji to https by default
by Nicolas Chauvet
commit 6fd2a3b975e21ececcacf8abded66640817cf631
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 13 10:04:36 2020 +0100
Switch koji to https by default
inventory/group_vars/buildarm | 4 ++--
inventory/group_vars/builders | 6 +++---
inventory/group_vars/buildhw | 6 +++---
inventory/group_vars/buildhw_aarch64 | 4 ++--
inventory/group_vars/buildhw_armv7 | 4 ++--
inventory/group_vars/buildvm | 6 +++---
inventory/group_vars/buildvm_aarch64 | 4 ++--
inventory/group_vars/buildvm_ppc64 | 4 ++--
inventory/group_vars/buildvm_ppc64le | 4 ++--
inventory/group_vars/releng_compose | 6 +++---
playbooks/groups/osbs-master.yml | 8 ++++----
roles/bodhi2/backend/templates/mash.conf | 2 +-
roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 | 6 +++---
roles/bodhi2/base/templates/production.ini.j2 | 2 +-
roles/koji_hub/files/kojira.conf | 2 +-
roles/koji_hub/templates/hub.conf.j2 | 2 +-
roles/koji_hub/templates/web.conf.j2 | 4 ++--
roles/pkgdb2/templates/pkgdb2.cfg | 2 +-
roles/robosignatory/files/koji.conf | 4 ++--
roles/sigul/bridge/files/koji-primary.conf | 4 ++--
20 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 76ea99a..0f385bf 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -5,9 +5,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/builders b/inventory/group_vars/builders
index 6c99f98..deea21e 100644
--- a/inventory/group_vars/builders
+++ b/inventory/group_vars/builders
@@ -6,9 +6,9 @@ fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
-koji_weburl: "http://koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org.org/koji"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
csi_security_category: High
csi_primary_contact: RPM Fusion Admins - sysadmin(a)lists.rpmfusion.org
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index c619eaa..9b85f3e 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -5,9 +5,9 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"
freezes: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
-koji_weburl: "http://koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org.org/koji"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildhw_aarch64 b/inventory/group_vars/buildhw_aarch64
index bde80bf..0b2ba31 100644
--- a/inventory/group_vars/buildhw_aarch64
+++ b/inventory/group_vars/buildhw_aarch64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildhw_armv7 b/inventory/group_vars/buildhw_armv7
index 76ea99a..0f385bf 100644
--- a/inventory/group_vars/buildhw_armv7
+++ b/inventory/group_vars/buildhw_armv7
@@ -5,9 +5,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index 08ea33c..7b52a27 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -18,9 +18,9 @@ fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
-koji_weburl: "http://koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org.org/koji"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
csi_security_category: High
csi_primary_contact: RPM Fusion Admins - sysadmin(a)lists.rpmfusion.org
diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index bde80bf..0b2ba31 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm_ppc64 b/inventory/group_vars/buildvm_ppc64
index bde80bf..0b2ba31 100644
--- a/inventory/group_vars/buildvm_ppc64
+++ b/inventory/group_vars/buildvm_ppc64
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le
index bde80bf..0b2ba31 100644
--- a/inventory/group_vars/buildvm_ppc64le
+++ b/inventory/group_vars/buildvm_ppc64le
@@ -6,9 +6,9 @@ ansible_ifcfg_blacklist: true
koji_hub_nfs: "rpmfusion_koji"
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
koji_weburl: "http:/koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These variables are pushed into /etc/system_identification by the base role.
# Groups and individual hosts should ovveride them with specific info.
diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose
index df8fd65..d46e4c3 100644
--- a/inventory/group_vars/releng_compose
+++ b/inventory/group_vars/releng_compose
@@ -24,9 +24,9 @@ kojihub_url: koji.rpmfusion.org/kojihub
kojihub_scheme: http
# for kojid config
-koji_server_url: "http://koji.rpmfusion.org/kojihub"
-koji_weburl: "http://koji.rpmfusion.org/koji"
-koji_topurl: "http://koji.rpmfusion.org/kojifiles"
+koji_server_url: "https://koji.rpmfusion.org.org/kojihub"
+koji_weburl: "https://koji.rpmfusion.org.org/koji"
+koji_topurl: "https://koji.rpmfusion.org.org/kojifiles"
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 8a30cc8..3d44e67 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -159,8 +159,8 @@
registry_uri: 'https://registry.stg.rpmfusion.org/v2',
source_registry_uri: 'https://registry.stg.rpmfusion.org/v2',
build_host: 'osbs.stg.rpmfusion.org',
- koji_root: 'http://koji.rpmfusion.org/koji',
- koji_hub: 'http://koji.rpmfusion.org/kojihub',
+ koji_root: 'https://koji.rpmfusion.org.org/koji',
+ koji_hub: 'https://koji.rpmfusion.org.org/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
@@ -189,8 +189,8 @@
registry_uri: 'https://osbs.rpmfusion.org/v2',
source_registry_uri: 'https://osbs.rpmfusion.org/v2',
build_host: 'osbs.rpmfusion.org',
- koji_root: 'http://koji.rpmfusion.org/koji',
- koji_hub: 'http://koji.rpmfusion.org/kojihub',
+ koji_root: 'https://koji.rpmfusion.org.org/koji',
+ koji_hub: 'https://koji.rpmfusion.org.org/kojihub',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
diff --git a/roles/bodhi2/backend/templates/mash.conf b/roles/bodhi2/backend/templates/mash.conf
index 4a6664a..a22c3fa 100644
--- a/roles/bodhi2/backend/templates/mash.conf
+++ b/roles/bodhi2/backend/templates/mash.conf
@@ -1,5 +1,5 @@
[defaults]
-buildhost = http://koji.rpmfusion.org/kojihub
+buildhost = https://koji.rpmfusion.org.org/kojihub
symlink = False
configdir = /etc/bodhi/
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 7cc394d..356bbeb 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -39,8 +39,8 @@ def usage():
def get_options():
# shamelessly stolen from koji CLI
opts = {
- 'server': 'http://koji.rpmfusion.org/kojihub',
- 'weburl': 'http://koji.rpmfusion.org/koji',
+ 'server': 'https://koji.rpmfusion.org.org/kojihub',
+ 'weburl': 'https://koji.rpmfusion.org.org/koji',
'cert': '/etc/pki/pkgdb/pkgdb.pem',
'ca': '/etc/pki/pkgdb/rpmfusion-upload-ca.cert',
'serverca': '/etc/pki/pkgdb/rpmfusion-server-ca.cert'
@@ -126,7 +126,7 @@ if __name__ == '__main__':
for arch in arches:
if arch == "primary":
- session = koji.ClientSession("http://koji.rpmfusion.org/kojihub")
+ session = koji.ClientSession("https://koji.rpmfusion.org.org/kojihub")
else:
session = koji.ClientSession("http://%s.koji.rpmfusion.org/kojihub" % arch)
try:
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 7832d0d..22b2a29 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -237,7 +237,7 @@ buildsystem = koji
koji_hub = https://koji.rpmfusion.org/kojihub
# Root url of the Koji instance to point to. No trailing slash
-koji_url = http://koji.rpmfusion.org
+koji_url = https://koji.rpmfusion.org.org
# URL of where users should go to set up their notifications
#fmn_url = https://apps.rpmfusion.org/notifications/
diff --git a/roles/koji_hub/files/kojira.conf b/roles/koji_hub/files/kojira.conf
index 25b1597..56d51fe 100644
--- a/roles/koji_hub/files/kojira.conf
+++ b/roles/koji_hub/files/kojira.conf
@@ -10,7 +10,7 @@
; keytab=/etc/kojira.keytab
; The URL for the koji hub server
-server=http://koji.rpmfusion.org/kojihub
+server=https://koji.rpmfusion.org.org/kojihub
; The directory containing the repos/ directory
topdir=/mnt/koji
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 607b6f7..4cef151 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -31,7 +31,7 @@ ProxyDNs = emailAddress=rpmfusion-buildsys(a)rpmfusion.org,CN=kojiweb,O=RPM Fusion
## Other options ##
LoginCreatesUser = On
{% if inventory_hostname.startswith('koji') %}
-KojiWebURL = http://koji.rpmfusion.org/koji
+KojiWebURL = https://koji.rpmfusion.org.org/koji
{% elif inventory_hostname.startswith('arm-koji') %}
KojiWebURL = http://arm.koji.rpmfusion.org/koji
{% endif %}
diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2
index d16491a..1cfca1f 100644
--- a/roles/koji_hub/templates/web.conf.j2
+++ b/roles/koji_hub/templates/web.conf.j2
@@ -13,8 +13,8 @@ KojiFilesURL = http://s390.koji.rpmfusion.org/kojifiles
KojiHubURL = http://arm.koji.rpmfusion.org/kojihub
KojiFilesURL = http://arm.koji.rpmfusion.org/kojifiles
{% else %}
-KojiHubURL = http://koji.rpmfusion.org/kojihub
-KojiFilesURL = http://koji.rpmfusion.org/kojifiles
+KojiHubURL = https://koji.rpmfusion.org.org/kojihub
+KojiFilesURL = https://koji.rpmfusion.org.org/kojifiles
{% endif %}
# SSL authentication options
diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg
index 80cf40d..53d54aa 100644
--- a/roles/pkgdb2/templates/pkgdb2.cfg
+++ b/roles/pkgdb2/templates/pkgdb2.cfg
@@ -204,6 +204,6 @@ PKGS_BUG_URL = 'https://bugzilla.rpmfusion.org/buglist.cgi?query_format=specific
PKGS_PKG_URL = 'http://rpmfusion.org/Package/%s'
CGIT_URL = 'https://pkgs.rpmfusion.org/cgit/?q=%s'
BODHI_URL = 'https://admin.rpmfusion.org/updates/?packages=%s'
-KOJI_URL = 'http://koji.rpmfusion.org/koji/search?'\
+KOJI_URL = 'https://koji.rpmfusion.org.org/koji/search?'\
'type=package&match=glob&terms=%s'
PKGDB2_ANITYA_DISTRO='RPM Fusion'
diff --git a/roles/robosignatory/files/koji.conf b/roles/robosignatory/files/koji.conf
index 1713a77..fcb5e33 100644
--- a/roles/robosignatory/files/koji.conf
+++ b/roles/robosignatory/files/koji.conf
@@ -1,6 +1,6 @@
[koji]
-server = http://koji.rpmfusion.org/kojihub
-weburl = http://koji.rpmfusion.org/koji
+server = https://koji.rpmfusion.org.org/kojihub
+weburl = https://koji.rpmfusion.org.org/koji
topurl = https://kojipkgs.rpmfusion.org/
anon_retry = false
cert = /etc/robosignatory/koji.cert
diff --git a/roles/sigul/bridge/files/koji-primary.conf b/roles/sigul/bridge/files/koji-primary.conf
index 37a7291..e04fa9c 100644
--- a/roles/sigul/bridge/files/koji-primary.conf
+++ b/roles/sigul/bridge/files/koji-primary.conf
@@ -3,10 +3,10 @@
;configuration for koji cli tool
;url of XMLRPC server
-server = http://koji.rpmfusion.org/kojihub
+server = https://koji.rpmfusion.org.org/kojihub
;url of web interface
-weburl = http://koji.rpmfusion.org/koji
+weburl = https://koji.rpmfusion.org.org/koji
;url of package download site
topurl = https://koji.rpmfusion.org/kojifiles
4 years, 1 month
- 1
- 0