schema/spacewalk/common/data/rhnPackageKey.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/145-spacewalk-package-key.sql | 9 utils/spacewalk-common-channels.ini | 154 +++++----- 3 files changed, 88 insertions(+), 77 deletions(-)
New commits: commit 3c589a9ac5fbb90da61d1c16c6021f7c34b51aba Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Oct 30 13:20:04 2012 +0100
Adding the RPM-GPG-KEY-spacewalk-2012 key id.
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql index dce320e..245c0c7 100644 --- a/schema/spacewalk/common/data/rhnPackageKey.sql +++ b/schema/spacewalk/common/data/rhnPackageKey.sql @@ -123,6 +123,8 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values (sequence_nextval('rhn_pkey_id_seq'), '95423d4e430a1c35', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk')); insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values (sequence_nextval('rhn_pkey_id_seq'), 'ed635379b3892132', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk')); +insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values +(sequence_nextval('rhn_pkey_id_seq'), '0e646f68863a853d', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
-- EPEL 5 insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/145-spacewalk-package-key.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/145-spacewalk-package-key.sql new file mode 100644 index 0000000..17690f4 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/145-spacewalk-package-key.sql @@ -0,0 +1,9 @@ + +update rhnPackageKey set provider_id = lookup_package_provider('Spacewalk') + where key_id = '0e646f68863a853d'; + +insert into rhnPackageKey (id, key_id, key_type_id, provider_id) + (select sequence_nextval('rhn_pkey_id_seq'), '0e646f68863a853d', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk') from dual + where not exists (select 1 from rhnPackageKey where key_id = '0e646f68863a853d')); + +commit;
commit 835b2e37762dea7770d7aa42f2c2c15f648220f9 Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Oct 30 13:11:19 2012 +0100
Adding Spacewalk 1.8 to spacewalk-common-channels.
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini index a4354ba..e44100a 100644 --- a/utils/spacewalk-common-channels.ini +++ b/utils/spacewalk-common-channels.ini @@ -29,7 +29,7 @@ yum_repo_label = External yum repo - %(name)s ## now define some "macros" _x86_archs = i386, x86_64 _centos4_archs = alpha, i386, ia64, s390, s390x, x86_64 -_spacewalk_gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk +_spacewalk_gpgkey_url = http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012 _spacewalk_gpgkey_id = 430A1C35 _spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
@@ -331,186 +331,186 @@ gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6 yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arch)s
-[spacewalk16-server-centos5] -name = Spacewalk Server 1.6 for %(base_channel_name)s +[spacewalk17-server-centos5] +name = Spacewalk Server 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos5-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6/RHEL/5/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/5/%(arch)s/
-[spacewalk16-server-centos6] -name = Spacewalk Server 1.6 for %(base_channel_name)s +[spacewalk17-server-centos6] +name = Spacewalk Server 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/
-[spacewalk16-server-scientific6] -name = Spacewalk Server 1.6 for %(base_channel_name)s +[spacewalk17-server-scientific6] +name = Spacewalk Server 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = scientific6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/
-[spacewalk16-server-fedora15] -name = Spacewalk Server 1.6 for %(base_channel_name)s +[spacewalk17-server-fedora15] +name = Spacewalk Server 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = fedora15-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7/Fedora/15/%(arch)s/
-[spacewalk16-server-fedora16] -name = Spacewalk Server 1.6 for %(base_channel_name)s +[spacewalk17-server-fedora16] +name = Spacewalk Server 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7/Fedora/16/%(arch)s/
-[spacewalk16-client-centos5] -name = Spacewalk Client 1.6 for %(base_channel_name)s +[spacewalk17-client-centos5] +name = Spacewalk Client 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos5-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6-client/RHEL/5/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/5/%(arch)s/
-[spacewalk16-client-centos6] -name = Spacewalk Client 1.6 for %(base_channel_name)s +[spacewalk17-client-centos6] +name = Spacewalk Client 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6-client/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/
-[spacewalk16-client-scientific6] -name = Spacewalk Client 1.6 for %(base_channel_name)s +[spacewalk17-client-scientific6] +name = Spacewalk Client 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = scientific6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6-client/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/
-[spacewalk16-client-fedora15] -name = Spacewalk Client 1.6 for %(base_channel_name)s +[spacewalk17-client-fedora15] +name = Spacewalk Client 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = fedora15-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6-client/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/Fedora/15/%(arch)s/
-[spacewalk16-client-fedora16] -name = Spacewalk Client 1.6 for %(base_channel_name)s +[spacewalk17-client-fedora16] +name = Spacewalk Client 1.7 for %(base_channel_name)s archs = i386, x86_64 base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.6-client/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/Fedora/16/%(arch)s/
-[spacewalk17-server-centos5] -name = Spacewalk Server 1.7 for %(base_channel_name)s +[spacewalk18-server-centos5] +name = Spacewalk Server 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos5-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/5/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8/RHEL/5/%(arch)s/
-[spacewalk17-server-centos6] -name = Spacewalk Server 1.7 for %(base_channel_name)s +[spacewalk18-server-centos6] +name = Spacewalk Server 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8/RHEL/6/%(arch)s/
-[spacewalk17-server-scientific6] -name = Spacewalk Server 1.7 for %(base_channel_name)s +[spacewalk18-server-scientific6] +name = Spacewalk Server 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = scientific6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8/RHEL/6/%(arch)s/
-[spacewalk17-server-fedora15] -name = Spacewalk Server 1.7 for %(base_channel_name)s +[spacewalk18-server-fedora16] +name = Spacewalk Server 1.8 for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora15-%(arch)s +base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8/Fedora/16/%(arch)s/
-[spacewalk17-server-fedora16] -name = Spacewalk Server 1.7 for %(base_channel_name)s +[spacewalk18-server-fedora17] +name = Spacewalk Server 1.8 for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora16-%(arch)s +base_channels = fedora17-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8/Fedora/17/%(arch)s/
-[spacewalk17-client-centos5] -name = Spacewalk Client 1.7 for %(base_channel_name)s +[spacewalk18-client-centos5] +name = Spacewalk Client 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos5-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/5/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8-client/RHEL/5/%(arch)s/
-[spacewalk17-client-centos6] -name = Spacewalk Client 1.7 for %(base_channel_name)s +[spacewalk18-client-centos6] +name = Spacewalk Client 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = centos6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8-client/RHEL/6/%(arch)s/
-[spacewalk17-client-scientific6] -name = Spacewalk Client 1.7 for %(base_channel_name)s +[spacewalk18-client-scientific6] +name = Spacewalk Client 1.8 for %(base_channel_name)s archs = i386, x86_64 base_channels = scientific6-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8-client/RHEL/6/%(arch)s/
-[spacewalk17-client-fedora15] -name = Spacewalk Client 1.7 for %(base_channel_name)s +[spacewalk18-client-fedora16] +name = Spacewalk Client 1.8 for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora15-%(arch)s +base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8-client/Fedora/16/%(arch)s/
-[spacewalk17-client-fedora16] -name = Spacewalk Client 1.7 for %(base_channel_name)s +[spacewalk18-client-fedora17] +name = Spacewalk Client 1.8 for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora16-%(arch)s +base_channels = fedora17-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/1.7-client/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/1.8-client/Fedora/17/%(arch)s/
@@ -541,23 +541,23 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s yumrepo_url = http://spacewalk.redhat.com/yum/nightly/RHEL/6/%(arch)s/
-[spacewalk-nightly-server-fedora15] +[spacewalk-nightly-server-fedora16] name = Spacewalk Server (N) for %(base_channel_name)s archs = x86_64 -base_channels = fedora15-%(arch)s +base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/16/%(arch)s/
-[spacewalk-nightly-server-fedora16] +[spacewalk-nightly-server-fedora17] name = Spacewalk Server (N) for %(base_channel_name)s archs = x86_64 -base_channels = fedora16-%(arch)s +base_channels = fedora17-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/nightly/Fedora/17/%(arch)s/
[spacewalk-nightly-client-centos5] @@ -587,20 +587,20 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/RHEL/6/%(arch)s/
-[spacewalk-nightly-client-fedora15] +[spacewalk-nightly-client-fedora16] name = Spacewalk Client (N) for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora15-%(arch)s +base_channels = fedora16-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/15/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/16/%(arch)s/
-[spacewalk-nightly-client-fedora16] +[spacewalk-nightly-client-fedora17] name = Spacewalk Client (N) for %(base_channel_name)s archs = i386, x86_64 -base_channels = fedora16-%(arch)s +base_channels = fedora17-%(arch)s gpgkey_url = %(_spacewalk_gpgkey_url)s gpgkey_id = %(_spacewalk_gpgkey_id)s gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s -yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/16/%(arch)s/ +yumrepo_url = http://spacewalk.redhat.com/yum/nightly-client/Fedora/17/%(arch)s/