From 21872fad3259f95c3b094d250fca79a40fbcb79c Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 29 Jun 2020 10:53:12 +0200
Subject: [PATCH] Activating some stuff for OEL 7

---
 files/repos-oel7/ol7_addons.repo          |  2 +-
 files/repos-oel7/ol7_latest.repo          |  2 +-
 files/repos-oel7/ol7_optional_latest.repo |  2 +-
 kickstart/template-oel7.ks                | 56 +++++++++++------------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/files/repos-oel7/ol7_addons.repo b/files/repos-oel7/ol7_addons.repo
index 1328f39..5dc6e14 100644
--- a/files/repos-oel7/ol7_addons.repo
+++ b/files/repos-oel7/ol7_addons.repo
@@ -3,6 +3,6 @@ name=Oracle Linux $releasever Add ons ($basearch)
 baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_addons/
 enabled=1
 gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/RPM-GPG-KEY-oracle
+gpgkey=https://repo01.pixelpark.com/gpg/ol7_addons.gpg
 
 # vim: filetype=dosini
diff --git a/files/repos-oel7/ol7_latest.repo b/files/repos-oel7/ol7_latest.repo
index dcf8178..c7502b2 100644
--- a/files/repos-oel7/ol7_latest.repo
+++ b/files/repos-oel7/ol7_latest.repo
@@ -3,6 +3,6 @@ name=Oracle Linux $releasever Latest ($basearch)
 baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_latest/
 enabled=1
 gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/RPM-GPG-KEY-oracle
+gpgkey=https://repo01.pixelpark.com/gpg/ol7_latest.gpg
 
 # vim: filetype=dosini
diff --git a/files/repos-oel7/ol7_optional_latest.repo b/files/repos-oel7/ol7_optional_latest.repo
index 665f7ec..cf93f12 100644
--- a/files/repos-oel7/ol7_optional_latest.repo
+++ b/files/repos-oel7/ol7_optional_latest.repo
@@ -3,7 +3,7 @@ name=Oracle Linux $releasever Optional Latest ($basearch)
 baseurl=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_optional_latest/
 enabled=1
 gpgcheck=1
-gpgkey=https://repo01.pixelpark.com/Linux/yum/OracleLinux/OL7/RPM-GPG-KEY-oracle
+gpgkey=https://repo01.pixelpark.com/gpg/ol7_optional_latest.gpg
 
 # vim: filetype=dosini
 
diff --git a/kickstart/template-oel7.ks b/kickstart/template-oel7.ks
index 3601c78..4ff768e 100644
--- a/kickstart/template-oel7.ks
+++ b/kickstart/template-oel7.ks
@@ -221,10 +221,10 @@ echo
 echo "Using snippet $vimrc_snippet"
 $SNIPPET($vimrc_snippet)
 
-## #set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.240.pkgs-el7.sh"
-## echo
-## echo "Using snippet $pkgs_snippet"
-## $SNIPPET($pkgs_snippet)
+#set $pkgs_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.240.pkgs-el7.sh"
+echo
+echo "Using snippet $pkgs_snippet"
+$SNIPPET($pkgs_snippet)
 
 #set $create_motd_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.300.create-motd.sh"
 echo
@@ -236,30 +236,30 @@ echo
 echo "Using snippet $root_ssh_snippet"
 $SNIPPET($root_ssh_snippet)
 
-## #set $legato_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.350.legato.sh"
-## echo
-## echo "Using snippet $legato_snippet"
-## $SNIPPET($legato_snippet)
-
-## #set $chrony_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.400.chrony.sh"
-## echo
-## echo "Using snippet $chrony_snippet"
-## $SNIPPET($chrony_snippet)
-
-## #set $puppet_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.450.puppet.sh"
-## echo
-## echo "Using snippet $puppet_snippet"
-## $SNIPPET($puppet_snippet)
-
-## #set $postfix_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.470.postfix.sh"
-## echo
-## echo "Using snippet $postfix_snippet"
-## $SNIPPET($postfix_snippet)
-
-## #set $logrotate_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.500.logrotate.sh"
-## echo
-## echo "Using snippet $logrotate_snippet"
-## $SNIPPET($logrotate_snippet)
+#set $legato_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.350.legato.sh"
+echo
+echo "Using snippet $legato_snippet"
+$SNIPPET($legato_snippet)
+
+#set $chrony_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.400.chrony.sh"
+echo
+echo "Using snippet $chrony_snippet"
+$SNIPPET($chrony_snippet)
+
+#set $puppet_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.450.puppet.sh"
+echo
+echo "Using snippet $puppet_snippet"
+$SNIPPET($puppet_snippet)
+
+#set $postfix_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.470.postfix.sh"
+echo
+echo "Using snippet $postfix_snippet"
+$SNIPPET($postfix_snippet)
+
+#set $logrotate_snippet = "per_status/" + $SYSTEM_STATUS + "/tpl.500.logrotate.sh"
+echo
+echo "Using snippet $logrotate_snippet"
+$SNIPPET($logrotate_snippet)
 
 ## ###########################
 ## Seems to be finished
-- 
2.39.5