From a8e6b240537c707deae8444d0626b645b07b84b3 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Thu, 15 Feb 2024 16:09:40 +0100
Subject: [PATCH 01/22] Ruby misshandled on setup.sh

---
 setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index 355a25d..5368c12 100755
--- a/setup.sh
+++ b/setup.sh
@@ -42,9 +42,9 @@ prepostinstall_checks()
   fi
 
   RUBYBIN=$(which ruby 2>/dev/null)
-  if [ -z "$GITBIN" ];
+  if [ -z "$RUBYBIN" ];
   then
-    $PKG_INSTALL $PKG_INSTALL_UNATTENDED git
+    $PKG_INSTALL $PKG_INSTALL_UNATTENDED ruby
 
     RUBYBIN=$(which ruby 2>/dev/null)
     if [ -z "$RUBYBIN" ];

From 3ae25e785a38e08fcd02b8c2c5138ee34ae1fe95 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Thu, 15 Feb 2024 16:27:08 +0100
Subject: [PATCH 02/22] Moving masterless repo source

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 5368c12..5d48a9d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -217,7 +217,7 @@ if [ ! -d "/opt/puppet-masterless/.git" ];
 then
   cd "/opt"
   rm -fr puppet-masterless
-  git clone https://github.com/jordiprats/puppet-masterless
+  git clone https://github.com/NTTCom-MS/bash-puppetmasterless
 else
   cd "/opt/puppet-masterless"
   git pull origin master

From 01a3a23b438db37a5e3b2e7044dc4e59a5830b6b Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:14:41 +0100
Subject: [PATCH 03/22] Update setup.sh

---
 setup.sh | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/setup.sh b/setup.sh
index 5d48a9d..ffd939d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -157,7 +157,7 @@ puppet_install()
       apt-get update
       $PKG_INSTALL $PKG_INSTALL_UNATTENDED puppet-agent
     fi
-    
+
   elif [ "${FACT_OSFAMILY}" == "Suse" ];
   then
     echo "SuSE unsupported"
@@ -179,25 +179,43 @@ puppet_install()
 
   echo "PUPPET VERSION: $(puppet --version)"
 
+  gem list | grep jwt >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install jwt -v 1.5.6
+  fi
+
+
   gem list | grep deep_merge >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
   then
+    gem install jwt -v 1.5.6
     gem install deep_merge
   fi
 
+  gem list | grep multipart-post >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install multipart-post -v 2.2.0
+  fi
+
   gem list | grep r10k >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
   then
-    gem install r10k
+    gem install jwt -v 1.5.5
+    gem install r10k -v 3.0.0
   fi
 
   /opt/puppetlabs/puppet/bin/gem list | grep r10k >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
   then
-    /opt/puppetlabs/puppet/bin/gem install r10k
+    /opt/puppetlabs/puppet/bin/gem install jwt -v 1.5.6
+    /opt/puppetlabs/puppet/bin/gem install r10k -v 3.0.0
   fi
 
 }
@@ -217,7 +235,7 @@ if [ ! -d "/opt/puppet-masterless/.git" ];
 then
   cd "/opt"
   rm -fr puppet-masterless
-  git clone https://github.com/NTTCom-MS/bash-puppetmasterless
+  git clone https://github.com/jordiprats/puppet-masterless
 else
   cd "/opt/puppet-masterless"
   git pull origin master

From 10dca7c999f15f97067b485bf357c251e4995eae Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:15:30 +0100
Subject: [PATCH 04/22] Update setup.sh

---
 setup.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index ffd939d..c540621 100755
--- a/setup.sh
+++ b/setup.sh
@@ -191,7 +191,6 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install jwt -v 1.5.6
     gem install deep_merge
   fi
 
@@ -206,7 +205,6 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install jwt -v 1.5.5
     gem install r10k -v 3.0.0
   fi
 

From 3e7b6cae06835cd2e4204b4404e9c2c027cc639e Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:24:21 +0100
Subject: [PATCH 05/22] Update setup.sh

---
 setup.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/setup.sh b/setup.sh
index 5d48a9d..51f3941 100755
--- a/setup.sh
+++ b/setup.sh
@@ -186,6 +186,35 @@ puppet_install()
     gem install deep_merge
   fi
 
+  gem list | grep cri >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install cri -v 2.8.0
+  fi
+
+  gem list | grep semantic_puppet >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install semnatic_puppet -v 1.0.4
+  fi
+  
+  gem list | grep fast_gettext >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install fast_gettext -v 1.1.0
+  fi
+  
+  gem list | grep multipart-post >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install multipart-post -v 2.2.0
+  fi
+
+
   gem list | grep r10k >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];

From e22bba15b35e1912da010c9c43ff72e9540d3ab6 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:31:37 +0100
Subject: [PATCH 06/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 51f3941..cf981c4 100755
--- a/setup.sh
+++ b/setup.sh
@@ -197,7 +197,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install semnatic_puppet -v 1.0.4
+    gem install semantic_puppet -v 1.0.4
   fi
   
   gem list | grep fast_gettext >/dev/null 2>&1

From 42d1ddec7d5465d492d2102c7acb9a6d68e46dc2 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:44:55 +0100
Subject: [PATCH 07/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index cf981c4..b0c9f59 100755
--- a/setup.sh
+++ b/setup.sh
@@ -219,7 +219,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install r10k
+    gem install r10k -v 3.0.0
   fi
 
   /opt/puppetlabs/puppet/bin/gem list | grep r10k >/dev/null 2>&1

From 7fd3a258ee7ed9256c212d1d27826421ddb231ae Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:47:29 +0100
Subject: [PATCH 08/22] Update setup.sh

---
 setup.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index b0c9f59..b325597 100755
--- a/setup.sh
+++ b/setup.sh
@@ -179,20 +179,19 @@ puppet_install()
 
   echo "PUPPET VERSION: $(puppet --version)"
 
-  gem list | grep deep_merge >/dev/null 2>&1
+  gem list | grep cri >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
   then
-    gem install deep_merge
+    gem install cri -v 2.8.0
   fi
-
-  gem list | grep cri >/dev/null 2>&1
+  
+  gem list | grep deep_merge >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
   then
-    gem install cri -v 2.8.0
+    gem install deep_merge
   fi
-
   gem list | grep semantic_puppet >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
@@ -214,6 +213,12 @@ puppet_install()
     gem install multipart-post -v 2.2.0
   fi
 
+  gem list | grep jwt >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install jwt -v 1.5.7
+  fi
 
   gem list | grep r10k >/dev/null 2>&1
 

From cedf87b4bc9e3a5596cc36ce8f0f9c2e3d67fcb4 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:55:39 +0100
Subject: [PATCH 09/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index b325597..8a05440 100755
--- a/setup.sh
+++ b/setup.sh
@@ -217,7 +217,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install jwt -v 1.5.7
+    gem install jwt -v 1.5.6
   fi
 
   gem list | grep r10k >/dev/null 2>&1

From 69737a82cfb3f6c9b363920ed59bf884667002db Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 15:08:12 +0100
Subject: [PATCH 10/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 8a05440..7a30b51 100755
--- a/setup.sh
+++ b/setup.sh
@@ -231,7 +231,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    /opt/puppetlabs/puppet/bin/gem install r10k
+    /opt/puppetlabs/puppet/bin/gem install r10k -v 3.0.0
   fi
 
 }

From 822fe463c80e511f0d2f2b9aa686489dc5d65a6e Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 15:23:23 +0100
Subject: [PATCH 11/22] Update setup.sh

---
 setup.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup.sh b/setup.sh
index 7a30b51..32461af 100755
--- a/setup.sh
+++ b/setup.sh
@@ -231,6 +231,12 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
+    /opt/puppetlabs/puppet/bin/gem install cri -v 2.8.0
+    /opt/puppetlabs/puppet/bin/gem install deep_merge
+    /opt/puppetlabs/puppet/bin/gem install semantic_puppet -v 1.0.4
+    /opt/puppetlabs/puppet/bin/gem install fast_gettext -v 1.1.0
+    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.2.0
+    /opt/puppetlabs/puppet/bin/gem install jwt -v 1.5.6
     /opt/puppetlabs/puppet/bin/gem install r10k -v 3.0.0
   fi
 

From 7494299bf031def2b5de7ddbdb7f79792049ba52 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Fri, 16 Feb 2024 15:36:12 +0100
Subject: [PATCH 12/22] Update setup.sh

---
 setup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setup.sh b/setup.sh
index 32461af..25ce011 100755
--- a/setup.sh
+++ b/setup.sh
@@ -179,6 +179,12 @@ puppet_install()
 
   echo "PUPPET VERSION: $(puppet --version)"
 
+  gem list | grep multipart-post >/dev/null 2>&1
+
+  if [ "$?" -ne 0 ];
+  then
+    gem install multipart-post -v 2.1.0
+  fi
   gem list | grep cri >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];
@@ -231,6 +237,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
+    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.0
     /opt/puppetlabs/puppet/bin/gem install cri -v 2.8.0
     /opt/puppetlabs/puppet/bin/gem install deep_merge
     /opt/puppetlabs/puppet/bin/gem install semantic_puppet -v 1.0.4

From 7a95d1601befab6df6402d172916778fcbc43944 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 12:16:38 +0100
Subject: [PATCH 13/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 25ce011..92387e6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -264,7 +264,7 @@ if [ ! -d "/opt/puppet-masterless/.git" ];
 then
   cd "/opt"
   rm -fr puppet-masterless
-  git clone https://github.com/NTTCom-MS/bash-puppetmasterless
+  git clone https://github.com/NTTCom-MS/bash-puppetmasterless bash-puppetmasterless
 else
   cd "/opt/puppet-masterless"
   git pull origin master

From 878eb1c1c6dd59fe2ccf3153d24ea9ccc97f1818 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 12:27:00 +0100
Subject: [PATCH 14/22] Update setup.sh

---
 setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index 92387e6..8e32809 100755
--- a/setup.sh
+++ b/setup.sh
@@ -189,7 +189,7 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    gem install cri -v 2.8.0
+    gem install cri -v 2.9.0
   fi
   
   gem list | grep deep_merge >/dev/null 2>&1
@@ -238,7 +238,7 @@ puppet_install()
   if [ "$?" -ne 0 ];
   then
     /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.0
-    /opt/puppetlabs/puppet/bin/gem install cri -v 2.8.0
+    /opt/puppetlabs/puppet/bin/gem install cri -v 2.9.0
     /opt/puppetlabs/puppet/bin/gem install deep_merge
     /opt/puppetlabs/puppet/bin/gem install semantic_puppet -v 1.0.4
     /opt/puppetlabs/puppet/bin/gem install fast_gettext -v 1.1.0

From 36142038ff341bd4722ca21514394e2a555afc82 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 14:41:17 +0100
Subject: [PATCH 15/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 8e32809..a0b43d0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -238,7 +238,7 @@ puppet_install()
   if [ "$?" -ne 0 ];
   then
     /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.0
-    /opt/puppetlabs/puppet/bin/gem install cri -v 2.9.0
+    /opt/puppetlabs/puppet/bin/gem install cri -v 2.15.10
     /opt/puppetlabs/puppet/bin/gem install deep_merge
     /opt/puppetlabs/puppet/bin/gem install semantic_puppet -v 1.0.4
     /opt/puppetlabs/puppet/bin/gem install fast_gettext -v 1.1.0

From 7308039ca5a9d95301a0ccbb6825d3609124a123 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 14:48:50 +0100
Subject: [PATCH 16/22] Update setup.sh

---
 setup.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.sh b/setup.sh
index a0b43d0..b579dac 100755
--- a/setup.sh
+++ b/setup.sh
@@ -237,14 +237,14 @@ puppet_install()
 
   if [ "$?" -ne 0 ];
   then
-    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.0
+    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.1
     /opt/puppetlabs/puppet/bin/gem install cri -v 2.15.10
     /opt/puppetlabs/puppet/bin/gem install deep_merge
     /opt/puppetlabs/puppet/bin/gem install semantic_puppet -v 1.0.4
-    /opt/puppetlabs/puppet/bin/gem install fast_gettext -v 1.1.0
-    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.2.0
-    /opt/puppetlabs/puppet/bin/gem install jwt -v 1.5.6
-    /opt/puppetlabs/puppet/bin/gem install r10k -v 3.0.0
+    /opt/puppetlabs/puppet/bin/gem install fast_gettext -v 1.1.2
+    /opt/puppetlabs/puppet/bin/gem install multipart-post -v 2.1.1
+    /opt/puppetlabs/puppet/bin/gem install jwt -v 2.2.3
+    /opt/puppetlabs/puppet/bin/gem install r10k -v 3.12.1
   fi
 
 }

From 8d7288d85273b8c1f9fbd5b1f42347e227920006 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 14:49:52 +0100
Subject: [PATCH 17/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index b579dac..4c77478 100755
--- a/setup.sh
+++ b/setup.sh
@@ -264,7 +264,7 @@ if [ ! -d "/opt/puppet-masterless/.git" ];
 then
   cd "/opt"
   rm -fr puppet-masterless
-  git clone https://github.com/NTTCom-MS/bash-puppetmasterless bash-puppetmasterless
+  git clone https://github.com/NTTCom-MS/bash-puppetmasterless puppet-masterless
 else
   cd "/opt/puppet-masterless"
   git pull origin master

From 7d9848fba0b3786b6bbcb019a98b0775e2009cd4 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:10:47 +0100
Subject: [PATCH 18/22] Update setup.sh

---
 setup.sh | 54 ------------------------------------------------------
 1 file changed, 54 deletions(-)

diff --git a/setup.sh b/setup.sh
index 4c77478..a721ae5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -179,60 +179,6 @@ puppet_install()
 
   echo "PUPPET VERSION: $(puppet --version)"
 
-  gem list | grep multipart-post >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install multipart-post -v 2.1.0
-  fi
-  gem list | grep cri >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install cri -v 2.9.0
-  fi
-  
-  gem list | grep deep_merge >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install deep_merge
-  fi
-  gem list | grep semantic_puppet >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install semantic_puppet -v 1.0.4
-  fi
-  
-  gem list | grep fast_gettext >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install fast_gettext -v 1.1.0
-  fi
-  
-  gem list | grep multipart-post >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install multipart-post -v 2.2.0
-  fi
-
-  gem list | grep jwt >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install jwt -v 1.5.6
-  fi
-
-  gem list | grep r10k >/dev/null 2>&1
-
-  if [ "$?" -ne 0 ];
-  then
-    gem install r10k -v 3.0.0
-  fi
-
   /opt/puppetlabs/puppet/bin/gem list | grep r10k >/dev/null 2>&1
 
   if [ "$?" -ne 0 ];

From 7843564c3be41df38bd15133bc9d69f296958264 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:41:04 +0200
Subject: [PATCH 19/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index a721ae5..ae9b4ce 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,7 +4,7 @@ prepostinstall_checks()
 {
   if [ "${FACT_OSFAMILY}" == "RedHat" ];
   then
-    PKG_INSTALL="yum install"
+    PKG_INSTALL="yum install --disablerepo=* --enablerepo=C7.8.2003-base"
     PKG_INSTALL_UNATTENDED="-y"
     WHICH_PACKAGE="which"
   fi

From 569cf8c882dafaa463e0f7bcc8c33ff516652606 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:43:43 +0200
Subject: [PATCH 20/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index ae9b4ce..a721ae5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,7 +4,7 @@ prepostinstall_checks()
 {
   if [ "${FACT_OSFAMILY}" == "RedHat" ];
   then
-    PKG_INSTALL="yum install --disablerepo=* --enablerepo=C7.8.2003-base"
+    PKG_INSTALL="yum install"
     PKG_INSTALL_UNATTENDED="-y"
     WHICH_PACKAGE="which"
   fi

From 93b57a780faca594c7c0691543ee5cd179daceb4 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:00:47 +0200
Subject: [PATCH 21/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index c540621..f8fc99e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -144,7 +144,7 @@ puppet_install()
   if [ "${FACT_OSFAMILY}" == "RedHat" ];
   then
     rpm -Uvh https://yum.puppet.com/puppet5/puppet5-release-el-${FACT_OPERATINGSYSTEMMAJRELEASE}.noarch.rpm
-    $PKG_INSTALL $PKG_INSTALL_UNATTENDED puppet-agent
+    $PKG_INSTALL $PKG_INSTALL_UNATTENDED puppet-agent --disablerepo=* --enablerepo=puppet5
   elif [ "${FACT_OSFAMILY}" == "Debian" ];
   then
     if [ "${FACT_OPERATINGSYSTEMMAJRELEASE}" == "18.04" ] || [ "${FACT_OPERATINGSYSTEMMAJRELEASE}" == "20.04" ] ;

From 716051bbb5c96259d5a861a397ac7a640c78a430 Mon Sep 17 00:00:00 2001
From: mherrre <74656723+mherrre@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:15:24 +0200
Subject: [PATCH 22/22] Update setup.sh

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index a721ae5..d361c00 100755
--- a/setup.sh
+++ b/setup.sh
@@ -144,7 +144,7 @@ puppet_install()
   if [ "${FACT_OSFAMILY}" == "RedHat" ];
   then
     rpm -Uvh https://yum.puppet.com/puppet5/puppet5-release-el-${FACT_OPERATINGSYSTEMMAJRELEASE}.noarch.rpm
-    $PKG_INSTALL $PKG_INSTALL_UNATTENDED puppet-agent
+    $PKG_INSTALL $PKG_INSTALL_UNATTENDED puppet-agent --disablerepo=* --enablerepo=puppet5
   elif [ "${FACT_OSFAMILY}" == "Debian" ];
   then
     if [ "${FACT_OPERATINGSYSTEMMAJRELEASE}" == "18.04" ] || [ "${FACT_OPERATINGSYSTEMMAJRELEASE}" == "20.04" ] ;