From 619be972aa9da089110cc7ba42341740c373b7b2 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Mon, 12 Dec 2016 14:43:57 +0100 Subject: [PATCH 1/3] use koji 'staging' profile for DevConfiguration; prefer https over http --- conf/config.py | 3 ++- conf/koji.conf | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/config.py b/conf/config.py index bddd1dc4..7dfcc340 100644 --- a/conf/config.py +++ b/conf/config.py @@ -114,6 +114,8 @@ class DevConfiguration(BaseConfiguration): # FAS_PASSWORD = os.environ('FAS_PASSWORD') # you could store it here # FAS_PASSWORD = commands.getoutput('pass your_fas_password').strip() + KOJI_CONFIG = path.join(confdir, 'koji.conf') + KOJI_PROFILE = 'staging' KOJI_ARCHES = ['x86_64'] KOJI_REPOSITORY_URL = 'http://kojipkgs.stg.fedoraproject.org/repos' @@ -123,7 +125,6 @@ class DevConfiguration(BaseConfiguration): SSL_CERTIFICATE_KEY_FILE = path.join(confdir, 'server.key') SSL_CA_CERTIFICATE_FILE = path.join(confdir, 'cacert.pem') - KOJI_CONFIG = path.join(confdir, 'koji.conf') COPR_CONFIG = path.join(confdir, 'copr.conf') diff --git a/conf/koji.conf b/conf/koji.conf index 00a4184f..7a90c4b6 100644 --- a/conf/koji.conf +++ b/conf/koji.conf @@ -3,13 +3,13 @@ ;configuration for koji cli tool ;url of XMLRPC server -server = http://koji.stg.fedoraproject.org/kojihub +server = https://koji.stg.fedoraproject.org/kojihub ;url of web interface -weburl = http://koji.stg.fedoraproject.org/koji +weburl = https://koji.stg.fedoraproject.org/koji ;url of package download site -topurl = http://kojipkgs.fedoraproject.org/ +topurl = https://kojipkgs.fedoraproject.org/ ;path to the koji top directory ;topdir = /mnt/koji @@ -24,7 +24,7 @@ topurl = http://kojipkgs.fedoraproject.org/ authtype = kerberos [staging] -server = http://koji.stg.fedoraproject.org/kojihub -weburl = http://koji.stg.fedoraproject.org/koji +server = https://koji.stg.fedoraproject.org/kojihub +weburl = https://koji.stg.fedoraproject.org/koji topurl = https://kojipkgs.stg.fedoraproject.org/ authtype = kerberos From 178f2657fa1ba8d6b40ab887e4d49210502653d9 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Mon, 12 Dec 2016 15:53:53 +0100 Subject: [PATCH 2/3] main profile/section should serve for 'prod' purpose --- conf/koji.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/koji.conf b/conf/koji.conf index 7a90c4b6..c06cf713 100644 --- a/conf/koji.conf +++ b/conf/koji.conf @@ -3,10 +3,10 @@ ;configuration for koji cli tool ;url of XMLRPC server -server = https://koji.stg.fedoraproject.org/kojihub +server = https://koji.fedoraproject.org/kojihub ;url of web interface -weburl = https://koji.stg.fedoraproject.org/koji +weburl = https://koji.fedoraproject.org/koji ;url of package download site topurl = https://kojipkgs.fedoraproject.org/ From 59f193461d1dcf06adf9be9bded2cb5b413b9a0d Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Mon, 12 Dec 2016 15:55:38 +0100 Subject: [PATCH 3/3] do not use canonicalization of hostnames for use in service principal names --- conf/koji.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/koji.conf b/conf/koji.conf index c06cf713..f72c4611 100644 --- a/conf/koji.conf +++ b/conf/koji.conf @@ -28,3 +28,4 @@ server = https://koji.stg.fedoraproject.org/kojihub weburl = https://koji.stg.fedoraproject.org/koji topurl = https://kojipkgs.stg.fedoraproject.org/ authtype = kerberos +krb_rdns = false