From 26a000a9477f1fbc4968cb7ea4cd56d941d3701a Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Sun, 29 Oct 2023 02:09:15 +0200
Subject: [PATCH] ome centos stuff

---
 lib.cf | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/lib.cf b/lib.cf
index c4634bc..6b7eae9 100644
--- a/lib.cf
+++ b/lib.cf
@@ -215,12 +215,17 @@ vars:
 
 methods:
 	do_install::
+		"any" usebundle => install_wget;
 		"any" usebundle => wmde_install_packages(@(pkgs),"apt_repo");
 
 commands:
 	do_install::
 		"/bin/sh"
-		args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/install-php-repo.sh  $(name) $(repo_src) $(key_src) $(key_name)";
+		args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/install-php-repo.sh  $(name) $(repo_src) $(key_src) $(key_name)",
+			depends_on => {
+				"wget_pkgs_installed",
+				"apt_repo_pkgs_installed"
+			};
 
 }
 
@@ -248,19 +253,33 @@ bundle agent install_system_repos
 classes:
 	centos::
 		"centos_9_and_later" expression =>  isgreaterthan("$(sys.os_version_major)", "8") ;
-vars:
-	"pkgs" slist => {};
-	centos::
-		"pkgs" slist => {
-			"epel-release"
-		};
+
 commands:
+
+vars:
+#	centos::
+#		"pkgs" slist => {
+#			"epel-release"
+#		};
+#	!centos::
+#	"pkgs" slist => {},
+#	handle => "system_repos_pkgs_installed";
+	
+commands:
+	centos::
+	"/usr/bin/yum"
+	args =>	"install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(sys.os_version_major).noarch.rpm",
+	if => not(returnszero("rpm -q epel-release > /dev/null","useshell")),
+	handle=>"system_repos_pkgs_installed";
+
+
+
 	centos_9_and_later::
 		"/usr/bin/dnf"
 		inform => "false",
 		args => "config-manager --set-enabled crb";
 methods:
-	"any" usebundle => wmde_install_packages(@(pkgs),"system_repos");
+#	"any" usebundle => wmde_install_packages(@(pkgs),"system_repos");
 
 reports:
 }