diff --git a/roles/mirrormanager/backend/files/umdl-required b/roles/mirrormanager/backend/files/umdl-required index 6d5a3ae2cc..516481b14b 100644 --- a/roles/mirrormanager/backend/files/umdl-required +++ b/roles/mirrormanager/backend/files/umdl-required @@ -28,6 +28,7 @@ elif [ "${1}" == "fedora-secondary" ]; then CATEGORY="Fedora Secondary Arches" elif [ "${1}" == "archive" ]; then CATEGORY="Fedora Archive" + SCANNER="/usr/local/bin/scan-primary-mirror" elif [ "${1}" == "codecs" ]; then CATEGORY="Fedora Codecs" SCANNER="/usr/local/bin/scan-primary-mirror" diff --git a/roles/mirrormanager/backend/templates/scan-primary-mirror.toml b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml index 4ac16cac84..3c6e5cf05b 100644 --- a/roles/mirrormanager/backend/templates/scan-primary-mirror.toml +++ b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml @@ -1,7 +1,7 @@ max_propagation_days = 2 max_stale_days = 3 excludes=[".*\\.snapshot", ".*/\\.~tmp~"] -skip_paths_for_version=["pub/alt"] +skip_paths_for_version=["pub/alt", "pub/archive"] test_paths=["/test/", "/stage/"] skip_repository_paths = ["Cloud", "Workstation", "Server", "drpms" ] do_not_display_paths = ["_Beta"] @@ -94,3 +94,38 @@ url="/srv/codecs.fedoraproject.org/" regex="codecs.fedoraproject.org/openh264/[\\.\\d]+/.*" prefix="fedora-cisco-openh264" +### Fedora Archive ### + +[[category]] +name="Fedora Archive" +type="directory" +url="/srv/pub/archive/" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/(core|releases|development)/(rawhide|[\\.\\d]+)/.*" +prefix="fedora" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Everything/.*" +prefix="updates-released" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Modular/.*" +prefix="updates-released-modular" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Everything/.*" +prefix="updates-testing" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Modular/.*" +prefix="updates-testing-modular" + +# pre modular structure +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/testing/([\\.\\d]+)/[^ME].*" +prefix="updates-testing" + +[[repository_mapping]] +regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/([\\.\\d]+)/[^ME].*" +prefix="updates-released"