update the set of various distros supported

diff --git a/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in
deleted file mode 100644 (file)
index 04935eb..0000000
--- a/nodeconfig/yum/f10/yum.myplc.d/fedora-updates.repo.in
+++ /dev/null
@@ -1,29 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora

diff --git a/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in
deleted file mode 100644 (file)
index 15313be..0000000
--- a/nodeconfig/yum/f10/yum.myplc.d/fedora.repo.in
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
-
-[fedora-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

diff --git a/nodeconfig/yum/f12/yum.conf b/nodeconfig/yum/f12/yum.conf
deleted file mode 100644 (file)
index cd6fefe..0000000
--- a/nodeconfig/yum/f12/yum.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Fedora 12
-[main]
-# Overwriting the default yum repos dir
-reposdir=/etc/yum.myplc.d
-cachedir=/var/cache/yum
-debuglevel=1
-logfile=/var/log/yum.log
-lockfile=/var/lock/yum.pid
-pkgpolicy=newest
-distroverpkg=fedora-release
-installonlypkgs=
-exactarch=0

diff --git a/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in
deleted file mode 100644 (file)
index 15313be..0000000
--- a/nodeconfig/yum/f12/yum.myplc.d/fedora.repo.in
+++ /dev/null
@@ -1,29 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
-
-[fedora-debuginfo]
-name=Fedora $releasever - $basearch - Debug
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
-
-[fedora-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY

diff --git a/nodeconfig/yum/f23/dnf/dnf.conf b/nodeconfig/yum/f23/dnf/dnf.conf
new file mode 100644 (file)
index 0000000..16c41dc
--- /dev/null
+++ b/nodeconfig/yum/f23/dnf/dnf.conf
@@ -0,0 +1,8 @@
+[main]
+gpgcheck=1
+installonly_limit=3
+clean_requirements_on_remove=true
+# actually this does not seem to be supported by dnf
+# see ../../../db-config.d/030-conf_files_node_update
+# for how we worked around this issue
+reposdir=/etc/yum.myplc.d

diff --git a/nodeconfig/yum/f16/yum.conf b/nodeconfig/yum/f23/yum.conf
similarity index 85%
rename from nodeconfig/yum/f16/yum.conf
rename to nodeconfig/yum/f23/yum.conf
index a10a889..ed1b4fc 100644 (file)
--- a/nodeconfig/yum/f16/yum.conf
+++ b/nodeconfig/yum/f23/yum.conf
@@ -1,11 +1,11 @@
-# Fedora 16
+# Fedora 22
 [main]
 # Overwriting the default yum repos dir
 reposdir=/etc/yum.myplc.d
 cachedir=/var/cache/yum
 debuglevel=1
 logfile=/var/log/yum.log
-lockfile=/var/lock/yum.pid
+lockfile=/run/lock/yum.pid
 pkgpolicy=newest
 distroverpkg=fedora-release
 installonlypkgs=

diff --git a/nodeconfig/yum/f16/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f23/yum.myplc.d/fedora-updates.repo.in
similarity index 100%
rename from nodeconfig/yum/f16/yum.myplc.d/fedora-updates.repo.in
rename to nodeconfig/yum/f23/yum.myplc.d/fedora-updates.repo.in

diff --git a/nodeconfig/yum/f16/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f23/yum.myplc.d/fedora.repo.in
similarity index 100%
rename from nodeconfig/yum/f16/yum.myplc.d/fedora.repo.in
rename to nodeconfig/yum/f23/yum.myplc.d/fedora.repo.in

diff --git a/nodeconfig/yum/f24/dnf/dnf.conf b/nodeconfig/yum/f24/dnf/dnf.conf
new file mode 100644 (file)
index 0000000..16c41dc
--- /dev/null
+++ b/nodeconfig/yum/f24/dnf/dnf.conf
@@ -0,0 +1,8 @@
+[main]
+gpgcheck=1
+installonly_limit=3
+clean_requirements_on_remove=true
+# actually this does not seem to be supported by dnf
+# see ../../../db-config.d/030-conf_files_node_update
+# for how we worked around this issue
+reposdir=/etc/yum.myplc.d

diff --git a/nodeconfig/yum/f10/yum.conf b/nodeconfig/yum/f24/yum.conf
similarity index 75%
rename from nodeconfig/yum/f10/yum.conf
rename to nodeconfig/yum/f24/yum.conf
index 04d950a..ed1b4fc 100644 (file)
--- a/nodeconfig/yum/f10/yum.conf
+++ b/nodeconfig/yum/f24/yum.conf
@@ -1,12 +1,13 @@
-# Fedora 10
+# Fedora 22
 [main]
 # Overwriting the default yum repos dir
 reposdir=/etc/yum.myplc.d
 cachedir=/var/cache/yum
 debuglevel=1
 logfile=/var/log/yum.log
-lockfile=/var/lock/yum.pid
+lockfile=/run/lock/yum.pid
 pkgpolicy=newest
 distroverpkg=fedora-release
 installonlypkgs=
-exactarch=0
+exactarch=1
+obsoletes=1

diff --git a/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f24/yum.myplc.d/fedora-updates.repo.in
similarity index 84%
rename from nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in
rename to nodeconfig/yum/f24/yum.myplc.d/fedora-updates.repo.in
index 04935eb..d57768f 100644 (file)
--- a/nodeconfig/yum/f12/yum.myplc.d/fedora-updates.repo.in
+++ b/nodeconfig/yum/f24/yum.myplc.d/fedora-updates.repo.in
@@ -6,7 +6,7 @@ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$r
 @NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
@@ -16,7 +16,7 @@ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-deb
 @NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-source]
 name=Fedora $releasever - Updates Source
@@ -26,4 +26,4 @@ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-sou
 @NODEYUMEXCLUDE@
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch

diff --git a/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in b/nodeconfig/yum/f24/yum.myplc.d/fedora.repo.in
similarity index 78%
rename from nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in
rename to nodeconfig/yum/f24/yum.myplc.d/fedora.repo.in
index 15313be..1abf007 100644 (file)
--- a/nodeconfig/yum/f8/yum.myplc.d/fedora.repo.in
+++ b/nodeconfig/yum/f24/yum.myplc.d/fedora.repo.in
@@ -6,7 +6,7 @@ mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&a
 @NODEYUMEXCLUDE@
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
@@ -15,8 +15,9 @@ failovermethod=priority
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
 @NODEYUMEXCLUDE@
 enabled=0
+metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [fedora-source]
 name=Fedora $releasever - Source
@@ -25,5 +26,6 @@ failovermethod=priority
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 @NODEYUMEXCLUDE@
 enabled=0
+metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch

diff --git a/nodeconfig/yum/f8/yum.conf b/nodeconfig/yum/f8/yum.conf
deleted file mode 100644 (file)
index 8f539ab..0000000
--- a/nodeconfig/yum/f8/yum.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Fedora 8
-[main]
-# Overwriting the default yum repos dir
-reposdir=/etc/yum.myplc.d
-cachedir=/var/cache/yum
-debuglevel=1
-logfile=/var/log/yum.log
-lockfile=/var/lock/yum.pid
-pkgpolicy=newest
-distroverpkg=fedora-release
-installonlypkgs=
-exactarch=0

diff --git a/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in b/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in
deleted file mode 100644 (file)
index a74512d..0000000
--- a/nodeconfig/yum/f8/yum.myplc.d/fedora-updates.repo.in
+++ /dev/null
@@ -1,59 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-source]
-name=Fedora $releasever - Updates Source
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-[updates-newkey]
-name=Fedora $releasever - $basearch - Updates Newkey
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever.newkey&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9
-
-[updates-newkey-debuginfo]
-name=Fedora $releasever - $basearch - Updates - Debug Newkey
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch.newkey/debug/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever.newkey&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9
-
-[updates-newkey-source]
-name=Fedora $releasever - Updates Source Newkey
-failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS.newkey/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever.newkey&arch=$basearch
-@NODEYUMEXCLUDE@
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9