From 24423775155beb668a868e9da0e8d15d2a04832f Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Mon, 14 Nov 2016 10:37:55 -0500
Subject: [PATCH] Moving to HTTPS for installer
---
.gitignore | 18 ------------------
Dockerfile | 2 +-
Jenkinsfile | 2 +-
.../etc/grouper.installer.properties | 3 ++-
4 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index e9487e3f..811f8fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,21 +7,3 @@ bin/run.sh
bin/start.sh
bin/stop.sh
bin/test.sh
-bin/build.sh
-bin/destroy.sh
-bin/install.sh
-bin/rebuild.sh
-bin/rerun.sh
-bin/run.sh
-bin/start.sh
-bin/stop.sh
-bin/test.sh
-bin/build.sh
-bin/destroy.sh
-bin/install.sh
-bin/rebuild.sh
-bin/rerun.sh
-bin/run.sh
-bin/start.sh
-bin/stop.sh
-bin/test.sh
diff --git a/Dockerfile b/Dockerfile
index 7993db52..49888ed4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ ONBUILD ADD additional_container_files /opt
RUN mkdir -p /opt/grouper/$VERSION \
&& mv /opt/etc/grouper.installer.properties /opt/grouper/$VERSION/. \
&& mv /opt/etc/MariaDB.repo /etc/yum.repos.d/MariaDB.repo \
- && curl -o /opt/grouper/$VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$VERSION/grouperInstaller.jar \
+ && curl -o /opt/grouper/$VERSION/grouperInstaller.jar https://software.internet2.edu/grouper/release/$VERSION/grouperInstaller.jar \
&& yum -y update \
&& yum -y install --setopt=tsflags=nodocs \
dos2unix \
diff --git a/Jenkinsfile b/Jenkinsfile
index 24f50167..fdd6ea9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ node('docker') {
stage 'Build'
try{
- sh 'bin/rebuild.sh &> debug'
+ sh 'bin/rebuild.sh >> debug'
} catch(error) {
def error_details = readFile('./debug');
def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
diff --git a/container_files/etc/grouper.installer.properties b/container_files/etc/grouper.installer.properties
index bc728d74..1c028c3b 100644
--- a/container_files/etc/grouper.installer.properties
+++ b/container_files/etc/grouper.installer.properties
@@ -1,5 +1,5 @@
# this should be before the version number
-download.server.url = http://software.internet2.edu/grouper
+download.server.url = https://software.internet2.edu/grouper
# default version to install
grouper.version = 2.3.0
# print out autorun keys in prompts so you can easily see how to configure the autorun
@@ -16,6 +16,7 @@ download.pspSource.url = https://github.com/Internet2/grouper-psp/archive/$BRANC
## If you uncomment one of these properties it will be used as empty, only uncomment to use
##
##############################
+
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true
########## AUTORUN PROPERTIES WITH NO DEFAULT OR ARE COMMONLY CHANGED