From 35556c50cb0abfbc6b504db793e8fcec96f83c0d Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 08:21:16 -0600 Subject: [PATCH 1/7] Up date mirror for jq dependency installation --- modules/install-consul/install-consul | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index d1505e02..ce53c30a 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -124,7 +124,9 @@ function install_dependencies { sudo apt-get install -y awscli curl unzip jq elif $(has_yum); then sudo yum update -y - sudo yum install -y aws curl unzip jq + sudo yum install -y aws curl unzip + sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + sudo yum install jq -y else log_error "Could not find apt-get or yum. Cannot install dependencies on this OS." exit 1 From 417254a63111cba8fa32789781a3247159261d79 Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 08:26:55 -0600 Subject: [PATCH 2/7] This adds the AWS binary dependency --- modules/install-consul/install-consul | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index ce53c30a..04409716 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -124,8 +124,11 @@ function install_dependencies { sudo apt-get install -y awscli curl unzip jq elif $(has_yum); then sudo yum update -y - sudo yum install -y aws curl unzip sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + sudo yum install python-pip + sudo pip install --upgrade pip + sudo pip install awscli + sudo yum install -y curl unzip sudo yum install jq -y else log_error "Could not find apt-get or yum. Cannot install dependencies on this OS." From 5c501617374bb8e8ab74f8b1bb533e48cc803886 Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 08:50:53 -0600 Subject: [PATCH 3/7] Formatting --- modules/install-consul/install-consul | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index 04409716..247ad3ea 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -125,10 +125,10 @@ function install_dependencies { elif $(has_yum); then sudo yum update -y sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - sudo yum install python-pip + sudo yum install python-pip -y sudo pip install --upgrade pip - sudo pip install awscli - sudo yum install -y curl unzip + sudo pip install awscli -y + sudo yum install curl unzip -y sudo yum install jq -y else log_error "Could not find apt-get or yum. Cannot install dependencies on this OS." From 7b3b1b2f76ca87021e120a9e578455f218f1ef85 Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 08:58:13 -0600 Subject: [PATCH 4/7] Update install-consul --- modules/install-consul/install-consul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index 247ad3ea..39173559 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -125,9 +125,9 @@ function install_dependencies { elif $(has_yum); then sudo yum update -y sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - sudo yum install python-pip -y + sudo yum install python-pip sudo pip install --upgrade pip - sudo pip install awscli -y + sudo pip install awscli sudo yum install curl unzip -y sudo yum install jq -y else From 36969d5a93638e3fc2cd60a894dc8ad6b459dae8 Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 09:09:39 -0600 Subject: [PATCH 5/7] Update install-consul --- modules/install-consul/install-consul | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index 39173559..d5bc1ab0 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -124,7 +124,6 @@ function install_dependencies { sudo apt-get install -y awscli curl unzip jq elif $(has_yum); then sudo yum update -y - sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm sudo yum install python-pip sudo pip install --upgrade pip sudo pip install awscli From c56c01689468562aab24cb5700e4163ae82fec68 Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 09:15:02 -0600 Subject: [PATCH 6/7] Update install-consul --- modules/install-consul/install-consul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index d5bc1ab0..2a1c6515 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -124,11 +124,11 @@ function install_dependencies { sudo apt-get install -y awscli curl unzip jq elif $(has_yum); then sudo yum update -y + sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm sudo yum install python-pip sudo pip install --upgrade pip sudo pip install awscli - sudo yum install curl unzip -y - sudo yum install jq -y + sudo yum install curl unzip jq -y else log_error "Could not find apt-get or yum. Cannot install dependencies on this OS." exit 1 From a34ecbbdbe444d49357238ae659ef6d40589e01a Mon Sep 17 00:00:00 2001 From: Void0x79 Date: Fri, 28 Feb 2020 09:21:36 -0600 Subject: [PATCH 7/7] Update install-consul --- modules/install-consul/install-consul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/install-consul/install-consul b/modules/install-consul/install-consul index 2a1c6515..482c301c 100755 --- a/modules/install-consul/install-consul +++ b/modules/install-consul/install-consul @@ -125,7 +125,7 @@ function install_dependencies { elif $(has_yum); then sudo yum update -y sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - sudo yum install python-pip + sudo yum install python-pip -y sudo pip install --upgrade pip sudo pip install awscli sudo yum install curl unzip jq -y