From 0761635667b2b33ec55ae616d6db0b72b9650043 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Mon, 29 Apr 2024 11:44:53 -0700
Subject: Use https: URLs by default

Both binrepo and maintdb servers now support TLS so use those URLs
for the server authentication that TLS provides.
---
 CHANGES                     | 3 +++
 MgaRepo/binrepo.py          | 4 ++--
 MgaRepo/commands/maintdb.py | 2 +-
 MgaRepo/util.py             | 2 +-
 mgarepo.conf                | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index d6bb72e..4b9519d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+* X
+- use https: URLs by default
+
 * 1.14.6
 - add a progress bar for upload binaries
 - bash-completion: remove executable bit
diff --git a/MgaRepo/binrepo.py b/MgaRepo/binrepo.py
index d96507c..a66df09 100644
--- a/MgaRepo/binrepo.py
+++ b/MgaRepo/binrepo.py
@@ -58,7 +58,7 @@ def download_binary(topdir, sha1, filename):
     fmt = config.get("global", "download-command",
 	    "wget -c -O '$dest' $url")
     url = config.get("binrepo", "download_url",
-	    "http://binrepo.mageia.org/")
+	    "https://binrepo.mageia.org/")
     url = mirror.normalize_path(url + "/" + sha1)
     dest = os.path.join(topdir, 'SOURCES', filename)
     if os.path.exists(dest):
@@ -88,7 +88,7 @@ def download_binaries(topdir):
 
 def binary_exists(sha1sum):
     dlurl = config.get("binrepo", "download_url",
-	    "http://binrepo.mageia.org/")
+	    "https://binrepo.mageia.org/")
     dlurl = mirror.normalize_path(dlurl + "/" + sha1sum)
     h = httplib2.Http()
     resp, content = h.request(dlurl, 'HEAD')
diff --git a/MgaRepo/commands/maintdb.py b/MgaRepo/commands/maintdb.py
index 920ff37..e3d54fe 100644
--- a/MgaRepo/commands/maintdb.py
+++ b/MgaRepo/commands/maintdb.py
@@ -33,7 +33,7 @@ def parse_options():
 def maintdb(maintdb_args):
     host = config.get("maintdb", "host", "maintdb.mageia.org")
     if (maintdb_args[0] == 'get' and len(maintdb_args)>=2):
-        url = config.get("maintdb", "url", "http://maintdb.mageia.org/")
+        url = config.get("maintdb", "url", "https://maintdb.mageia.org/")
         import urllib.request
         try:
             page=urllib.request.urlopen(url + maintdb_args[1])
diff --git a/MgaRepo/util.py b/MgaRepo/util.py
index 6d31399..b8dedaa 100644
--- a/MgaRepo/util.py
+++ b/MgaRepo/util.py
@@ -179,7 +179,7 @@ def rellink(src, dst):
     
 def maintdb_get(package):
     dlurl = config.get("maintdb", "url",
-            "http://maintdb.mageia.org/")
+            "https://maintdb.mageia.org/")
     dlurl = dlurl + "/" + package
     h = httplib2.Http()
     resp, content = h.request(dlurl, 'GET')
diff --git a/mgarepo.conf b/mgarepo.conf
index 932fa0d..d21dcf5 100644
--- a/mgarepo.conf
+++ b/mgarepo.conf
@@ -24,10 +24,10 @@ host = pkgsubmit.mageia.org
 default = Cauldron
 
 [binrepo]
-download_url = http://binrepo.mageia.org/
+download_url = https://binrepo.mageia.org/
 upload_host = binrepo.mageia.org
 
 [maintdb]
 host = maintdb.mageia.org
-url = http://maintdb.mageia.org/
+url = https://maintdb.mageia.org/
 
-- 
cgit v1.2.1