Merge pull request #3697 from cobbler/signatures/use-new-url

Signatures: Update default signatures URL
cobbler · May 27, 2024 · 5f09ab5 · 5f09ab5
2 parents 4989f12 + 44f7a3f
commit 5f09ab5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/changelog.d/3696.added b/changelog.d/3696.added
@@ -0,0 +1 @@
+Use new default URL for the signatures file
diff --git a/config/cobbler/settings.yaml b/config/cobbler/settings.yaml
@@ -572,7 +572,7 @@ iso_template_dir: "/etc/cobbler/iso"
 
 # Signatures
 signature_path: "/var/lib/cobbler/distro_signatures.json"
-signature_url: "https://cobbler.github.io/signatures/3.0.x/latest.json"
+signature_url: "https://cobbler.github.io/libcobblersignatures/data/v2/distro_signatures.json"
 
 # Set to "true" to enable Cobbler's dynamic DNS updates.
 nsupdate_enabled: false

diff --git a/docs/cobbler-conf/settings-yaml.rst b/docs/cobbler-conf/settings-yaml.rst
@@ -939,7 +939,7 @@ signature_url
 Updates to the signatures may happen more often then we have releases. To enable you to import new version we provide
 the most up to date signatures we offer on this like. You may host this file for yourself and adjust it for your needs.
 
-default: ``https://cobbler.github.io/signatures/3.0.x/latest.json``
+default: ``https://cobbler.github.io/libcobblersignatures/data/v2/distro_signatures.json``
 
 tftpboot_location
 #################

diff --git a/system-tests/tests/svc-settings b/system-tests/tests/svc-settings
@@ -143,7 +143,7 @@ cat >${tmp}/a <<-EOF
     "server": "192.168.1.1",
     "sign_puppet_certs_automatically": false,
     "signature_path": "/var/lib/cobbler/distro_signatures.json",
-    "signature_url": "https://cobbler.github.io/signatures/3.0.x/latest.json",
+    "signature_url": "https://cobbler.github.io/libcobblersignatures/data/v2/distro_signatures.json",
     "syslinux_dir": "/usr/share/syslinux",
     "syslinux_memdisk_folder": "/usr/share/syslinux",
     "syslinux_pxelinux_folder": "/usr/share/syslinux",

diff --git a/tests/test_data/V3_4_0/settings.yaml b/tests/test_data/V3_4_0/settings.yaml
@@ -568,7 +568,7 @@ puppet_version: 2
 
 # Signatures
 signature_path: "/var/lib/cobbler/distro_signatures.json"
-signature_url: "https://cobbler.github.io/signatures/3.0.x/latest.json"
+signature_url: "https://cobbler.github.io/libcobblersignatures/data/v2/distro_signatures.json"
 
 # Set to "true" to enable Cobbler's dynamic DNS updates.
 nsupdate_enabled: false

diff --git a/tests/utils/utils_test.py b/tests/utils/utils_test.py
@@ -173,7 +173,10 @@ def test_read_file_contents():
 @pytest.mark.parametrize(
     "remote_url,expected_result",
     [
-        ("https://cobbler.github.io/signatures/latest.json", True),
+        (
+            "https://cobbler.github.io/libcobblersignatures/data/v2/distro_signatures.json",
+            True,
+        ),
         ("https://cobbler.github.io/signatures/not_existing", False),
     ],
 )