From 22453f532d266d42ef41755a9d8f61554ac1f0ae Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Thu, 8 Mar 2018 14:51:27 +0000 Subject: [PATCH] Document the new Bodhi settings. Signed-off-by: Randy Barlow --- roles/bodhi2/base/templates/production.ini.j2 | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index a49cfb3..d11e776 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -197,7 +197,7 @@ fedora_28_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fe fedora_epel_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml {% endif %} -# {release}_{request}_master_repomd: This is used by the masher to determine when a +# {release}_({version}_){request}_master_repomd: This is used by the masher to determine when a # primary architecture push has been synchronized to the master mirror for a given release and # request. The masher will verify that the checksum of repomd.xml at the master URL matches the # expected value, and will poll the URL until this test passes. Substitute release and request @@ -205,10 +205,13 @@ fedora_epel_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s # arches listed in {release}_{version}_primary_arches when it is defined, else used for all # arches. You must put two %s's in this setting - the first will be replaced with the release # version and the second will be replaced with the architecture. -# fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml -# fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/%s/repodata/repomd.xml -# fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml -# fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%s/%s/repodata/repomd.xml +# If a version of the option exists with a matching version, it has priority over one without. +# examples (these settings do not have defaults): +# fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/%s/repodata/repomd.xml +# fedora_28_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%s/Everything/%s/repodata/repomd.xml +# fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%s/%s/repodata/repomd.xml +# fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml +# fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%s/%s/repodata/repomd.xml {% if env == 'production' %} fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%s/%s/repodata/repomd.xml fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%s/%s/repodata/repomd.xml @@ -223,7 +226,7 @@ fedora_modular_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/com fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%s-modular-updates-testing/compose/Everything/%s/os/repodata/repomd.xml {% endif %} -# {release}_{request}_alt_master_repomd: This is used by the masher to determine when a +# {release}_({version}_){request}_alt_master_repomd: This is used by the masher to determine when a # secondary architecture push has been synchronized to the master mirror for a given release and # request. The masher will verify that the checksum of repomd.xml at the master URL matches the # expected value, and will poll the URL until this test passes. Substitute release and request @@ -231,8 +234,11 @@ fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/co # arches not listed in {release}_{version}_primary_arches if it is defined. You must put two # %s's in this setting - the first will be replaced with the release version and the second will # be replaced with the architecture. -# fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/%s/repodata/repomd.xml -# fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml +# If a version of the option exists with a matching version, it has priority over one without. +# examples (these settings do not have defaults): +# fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/%s/repodata/repomd.xml +# fedora_28_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/Everything/%s/repodata/repomd.xml +# fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml {% if env == 'production' %} fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%s/%s/repodata/repomd.xml fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%s/%s/repodata/repomd.xml -- 1.8.3.1