Updating repo URLs

diff --git a/files/repos-centos7/epel.repo b/files/repos-centos7/epel.repo
deleted file mode 100644 (file)
index 3eae464..0000000
--- a/files/repos-centos7/epel.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-# EPEL Packages
-
-[epel]
-name=Extra Packages for Enterprise Linux 7 - $basearch
-baseurl=https://repo01.pixelpark.com/Linux/yum/epel/7/$basearch
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/RPM-GPG-KEY-EPEL-7
-repo_gpgcheck=0
-
-[epel-debuginfo]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/epel/7/$basearch/debug
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/RPM-GPG-KEY-EPEL-7
-repo_gpgcheck=0
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-7&arch=$basearch
-
-[epel-source]
-name=Extra Packages for Enterprise Linux 7 - $basearch - Source
-#baseurl=http://download.fedoraproject.org/pub/epel/7/SRPMS
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgkey=https://repo01.pixelpark.com/gpg/RPM-GPG-KEY-EPEL-7
-gpgcheck=1
-repo_gpgcheck=0
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-7&arch=$basearch
-
-# vim: filetype=dosini

diff --git a/files/repos-centos7/icinga.repo b/files/repos-centos7/icinga.repo
deleted file mode 100644 (file)
index e2185a7..0000000
--- a/files/repos-centos7/icinga.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Icinga.repo
-#
-
-[icinga]
-name=ICINGA (stable release for epel)
-baseurl=https://repo01.pixelpark.com/Linux/yum/icinga
-enabled=1
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/icinga2.gpg
-
-# vim: filetype=dosini

diff --git a/files/repos-centos7/pixelpark.repo b/files/repos-centos7/pixelpark.repo
deleted file mode 100644 (file)
index 751911e..0000000
--- a/files/repos-centos7/pixelpark.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Pixelpark.repo
-#
-
-[pixelpark]
-name=pixelpark
-baseurl=https://repo01.pixelpark.com/Linux/yum/pixelpark/7
-enabled=1
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/pixelpark.gpg
-
-# vim: filetype=dosini

diff --git a/files/repos-centos7/prometheus.repo b/files/repos-centos7/prometheus.repo
deleted file mode 100644 (file)
index 17a375f..0000000
--- a/files/repos-centos7/prometheus.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Prometheus.repo
-#
-
-[prometheus]
-name=Prometheus Last Repo
-baseurl=https://repo01.pixelpark.com/Linux/yum/prometheus/
-enabled=1
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/prometheus.gpg
-
-# vim: filetype=dosini

diff --git a/files/repos-centos7/puppet.repo b/files/repos-centos7/puppet.repo
deleted file mode 100644 (file)
index 0394956..0000000
--- a/files/repos-centos7/puppet.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Puppet.repo
-#
-
-[puppet]
-name=Puppet Repository el $releasever - $basearch
-baseurl=https://repo01.pixelpark.com/Linux/yum/puppetlabs/puppet5/el/$releasever/$basearch
-gpgkey=https://repo01.pixelpark.com/Linux/yum/puppetlabs/RPM-GPG-KEY-puppet
-enabled=1
-gpgcheck=1
-
-# vim: filetype=dosini

diff --git a/files/repos-centos7/wazuh.repo b/files/repos-centos7/wazuh.repo
deleted file mode 100644 (file)
index 0cec069..0000000
--- a/files/repos-centos7/wazuh.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# Wazuh.repo
-#
-
-[wazuh]
-name=Wazuh repository
-baseurl=https://repo01.pixelpark.com/Linux/yum/wazuh
-enabled=1
-gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/gpg/wazuh.gpg
-
-# vim: filetype=dosini

diff --git a/files/repos-centos8/CentOS-PowerTools.repo b/files/repos-centos8/CentOS-PowerTools.repo
index 8053862523d082a6d01ca8be4f25a20a326cbd6b..1f26e12e54d97910718ba530d66cffa9ce482621 100644 (file)
--- a/files/repos-centos8/CentOS-PowerTools.repo
+++ b/files/repos-centos8/CentOS-PowerTools.repo
@@ -2,7 +2,7 @@
 name=CentOS-$releasever - PowerTools
 baseurl=https://repo01.pixelpark.com/Linux/yum/centos/$releasever/PowerTools/$basearch/os/
 gpgcheck=1
-enabled=0
+enabled=1
 gpgkey=https://repo01.pixelpark.com/gpg/RPM-GPG-KEY-centosofficial
 
 # vim: filetype=dosini

diff --git a/files/repos-centos8/icinga.repo b/files/repos-centos8/icinga.repo
index 2af9c6da18a58066f20d1af76e2cb9a23b029924..932e4846c082f3458efcb28161a6a29fdeec56f5 100644 (file)
--- a/files/repos-centos8/icinga.repo
+++ b/files/repos-centos8/icinga.repo
@@ -1,6 +1,6 @@
 [icinga]
 name=ICINGA (stable release for epel)
-baseurl=https://repo01.pixelpark.com/Linux/yum/icinga
+baseurl=https://repo01.pixelpark.com/Linux/yum/icinga/8
 enabled=1
 gpgcheck=1
 gpgkey=https://repo01.pixelpark.com/gpg/icinga2.gpg

diff --git a/files/repos-centos8/prometheus.repo b/files/repos-centos8/prometheus.repo
index 983320052a7f2e4bbb3b4c9b99f12d3198189229..2dbaba2f36e76caae6909f9644a5df3b148e0064 100644 (file)
--- a/files/repos-centos8/prometheus.repo
+++ b/files/repos-centos8/prometheus.repo
@@ -1,6 +1,6 @@
 [prometheus]
 name=Prometheus Lest Repo
-baseurl=https://repo01.pixelpark.com/Linux/yum/prometheus/
+baseurl=https://repo01.pixelpark.com/Linux/yum/prom/8/
 enabled=1
 gpgcheck=1
 gpgkey=https://repo01.pixelpark.com/gpg/prometheus.gpg

diff --git a/files/repos-el7/icinga.repo b/files/repos-el7/icinga.repo
index e2185a7c587948dc411a7d8a2188df01f2a4b89b..b14f4b4e95441510e705aaf0f6eece5ac210b57b 100644 (file)
--- a/files/repos-el7/icinga.repo
+++ b/files/repos-el7/icinga.repo
@@ -3,7 +3,7 @@
 
 [icinga]
 name=ICINGA (stable release for epel)
-baseurl=https://repo01.pixelpark.com/Linux/yum/icinga
+baseurl=https://repo01.pixelpark.com/Linux/yum/icinga/7
 enabled=1
 gpgcheck=1
 gpgkey=https://repo01.pixelpark.com/gpg/icinga2.gpg

diff --git a/files/repos-el7/prometheus.repo b/files/repos-el7/prometheus.repo
index 17a375f95285c704090aeb2af992d6803bb0b4a9..f1c2729cde64112fcad794eb9d2a4dc58f6b5683 100644 (file)
--- a/files/repos-el7/prometheus.repo
+++ b/files/repos-el7/prometheus.repo
@@ -3,7 +3,7 @@
 
 [prometheus]
 name=Prometheus Last Repo
-baseurl=https://repo01.pixelpark.com/Linux/yum/prometheus/
+baseurl=https://repo01.pixelpark.com/Linux/yum/prom/7/
 enabled=1
 gpgcheck=1
 gpgkey=https://repo01.pixelpark.com/gpg/prometheus.gpg

diff --git a/kickstart/template-centos7.ks b/kickstart/template-centos7.ks
index d261e5e1425575ab280de2f62c8b8a6060937562..ae466714a6619dd780d83096a55e57490f1998a0 100644 (file)
--- a/kickstart/template-centos7.ks
+++ b/kickstart/template-centos7.ks
@@ -201,6 +201,11 @@ echo
 echo "Using snippet $get_repos_snippet"
 $SNIPPET($get_repos_snippet)
 
+#set $get_repos_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.170.repos_el7.sh"
+echo
+echo "Using snippet $get_repos_snippet"
+$SNIPPET($get_repos_snippet)
+
 #set $init_repos_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.200.init-repos.sh"
 echo
 echo "Using snippet $init_repos_snippet"

diff --git a/snippets/tpl.170.repos_centos7.sh b/snippets/tpl.170.repos_centos7.sh
index d62b0a1320435beca8654f970e2d83b22941ad72..9db7076b692c7e98609d09a83ea449e0b931c8f6 100644 (file)
--- a/snippets/tpl.170.repos_centos7.sh
+++ b/snippets/tpl.170.repos_centos7.sh
@@ -11,7 +11,6 @@ get_repos_centos7() {
     local base_url="${COBBLER_URL}/${ws_rel_filesdir}/${system_status}/repos/centos7"
 
     local -a repos=('CentOS-Base' 'CentOS-CR' 'CentOS-fasttrack')
-    repos+=('epel' 'icinga' 'pixelpark' 'prometheus' 'puppet' 'wazuh')
 
     local repo=
     local url=