From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 3 Aug 2020 08:12:24 +0000 (+0200)
Subject: Updating repo URLs
X-Git-Tag: 2.1.2^2~3^2
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=1ad927df3262a091576c17ade9cbccee22a0e7cf;p=pixelpark%2Fcreate-vmware-tpl.git

Updating repo URLs
---

diff --git a/files/repos-centos7/epel.repo b/files/repos-centos7/epel.repo
deleted file mode 100644
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
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
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
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
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
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 8053862..1f26e12 100644
--- 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 2af9c6d..932e484 100644
--- 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 9833200..2dbaba2 100644
--- 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 e2185a7..b14f4b4 100644
--- 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 17a375f..f1c2729 100644
--- 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 d261e5e..ae46671 100644
--- 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 d62b0a1..9db7076 100644
--- 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=