From 7dadd3b910926118206d3c3c4bb297a4ef143f99 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 21 Dec 2020 14:12:24 -0500 Subject: [PATCH 1/3] added execute permissions to shell scripts --- scripts/download-maven-alfresco-private.sh | 0 scripts/download-maven-alfresco-public.sh | 0 scripts/download-maven.sh | 0 scripts/download-url.sh | 0 scripts/unpack.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/download-maven-alfresco-private.sh mode change 100644 => 100755 scripts/download-maven-alfresco-public.sh mode change 100644 => 100755 scripts/download-maven.sh mode change 100644 => 100755 scripts/download-url.sh mode change 100644 => 100755 scripts/unpack.sh diff --git a/scripts/download-maven-alfresco-private.sh b/scripts/download-maven-alfresco-private.sh old mode 100644 new mode 100755 diff --git a/scripts/download-maven-alfresco-public.sh b/scripts/download-maven-alfresco-public.sh old mode 100644 new mode 100755 diff --git a/scripts/download-maven.sh b/scripts/download-maven.sh old mode 100644 new mode 100755 diff --git a/scripts/download-url.sh b/scripts/download-url.sh old mode 100644 new mode 100755 diff --git a/scripts/unpack.sh b/scripts/unpack.sh old mode 100644 new mode 100755 From 3a5d21f5e7e7b3dd5bae237eb39da2bb3b72aca8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 24 Dec 2020 17:17:27 -0500 Subject: [PATCH 2/3] fixed download scripts; added inteligr8 ones --- scripts/download-maven-inteligr8-private.sh | 7 +++++++ scripts/download-maven-inteligr8-public.sh | 7 +++++++ scripts/download-maven.bat | 2 +- scripts/download-maven.sh | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 scripts/download-maven-inteligr8-private.sh create mode 100755 scripts/download-maven-inteligr8-public.sh diff --git a/scripts/download-maven-inteligr8-private.sh b/scripts/download-maven-inteligr8-private.sh new file mode 100755 index 0000000..382c3aa --- /dev/null +++ b/scripts/download-maven-inteligr8-private.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# Usage: ./download-maven-inteligr8-private.sh org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password +THISDIR=`dirname "$(readlink -f "$0")"` + +MAVEN_BASEURL="http://repos.yateslong.us/nexus/repository/inteligr8" + +${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $* diff --git a/scripts/download-maven-inteligr8-public.sh b/scripts/download-maven-inteligr8-public.sh new file mode 100755 index 0000000..dbae8bd --- /dev/null +++ b/scripts/download-maven-inteligr8-public.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# Usage: ./download-maven-inteligr8-public.sh org/maven/group/path maven-artifact-id 1.2.3 jar +THISDIR=`dirname "$(readlink -f "$0")"` + +MAVEN_BASEURL="http://repos.yateslong.us/nexus/repositories/inteligr8-public" + +${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $* diff --git a/scripts/download-maven.bat b/scripts/download-maven.bat index 150d986..733be72 100644 --- a/scripts/download-maven.bat +++ b/scripts/download-maven.bat @@ -4,7 +4,7 @@ REM Usage: .\download-maven.bat https://repo1.maven.org/maven2 org/maven/group/p set THISDIR_REL=%~dp0 set THISDIR=%THISDIR_REL:~0,-1% -set MAVEN_BASE_URL=%1 +set MAVEN_BASEURL=%1 set MAVEN_GROUP_PATH=%2 set MAVEN_ARTIFACT_ID=%3 set MAVEN_ARTIFACT_VERSION=%4 diff --git a/scripts/download-maven.sh b/scripts/download-maven.sh index a8f2b43..856f65f 100755 --- a/scripts/download-maven.sh +++ b/scripts/download-maven.sh @@ -3,7 +3,7 @@ # Usage: ./download-maven.sh https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password THISDIR=`dirname "$(readlink -f "$0")"` -MAVEN_BASEDIR=$1 +MAVEN_BASEURL=$1 MAVEN_GROUP_PATH=$2 MAVEN_ARTIFACT_ID=$3 MAVEN_ARTIFACT_VERSION=$4 @@ -13,5 +13,6 @@ HTTP_PASSWORD=$7 MAVEN_ARTIFACT_FILENAME=${MAVEN_ARTIFACT_ID}-${MAVEN_ARTIFACT_VERSION}.${MAVEN_PACKAGING} MAVEN_URL=${MAVEN_BASEURL}/${MAVEN_GROUP_PATH}/${MAVEN_ARTIFACT_ID}/${MAVEN_ARTIFACT_VERSION}/${MAVEN_ARTIFACT_FILENAME} +echo $MAVEN_URL ${THISDIR}/download-url.sh "${MAVEN_URL}" "${MAVEN_ARTIFACT_FILENAME}" "${HTTP_USERNAME}" "${HTTP_PASSWORD}" From 4e8453becda18daad83857ba84836bad3ad130e5 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 23:08:07 -0500 Subject: [PATCH 3/3] removed port from reverse proxy; allows it to work when port changes --- nginx-ingress/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index c8aac96..467cae0 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -20,7 +20,7 @@ http { proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; proxy_redirect off; proxy_buffering off; - proxy_set_header Host $host:$server_port; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass_header Set-Cookie;