moved automated scripts files into auto directory

20 files changed, 20 insertions, 20 deletions

diff --git a/1-prereqs.sh b/1-prereqs.sh
index 781e70d..a751b2e 100755
--- a/1-prereqs.sh
+++ b/1-prereqs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
@@ -168,7 +168,7 @@ if [ -f /etc/network/interfaces.d/dummy0.interface ]; then
   PrintOkIndicator "Network interface dummy0 has already been configured."
 else
   function CopyInterfaceFile {
-    cp ./install-files/dummy0.interface /etc/network/interfaces.d
+    cp ./auto/dummy0.interface /etc/network/interfaces.d
   }
 
   Run "CopyInterfaceFile" \
@@ -194,7 +194,7 @@ if [ -f /etc/docker/daemon.json ]; then
   PrintOkIndicator "Docker Registry has already been configured."
 else
   function CreateDockerRegistryConfig {
-    cp ./install-files/daemon.json /etc/docker/
+    cp ./auto/daemon.json /etc/docker/
   }
 
   function RestartDocker {
diff --git a/2-jenkins.sh b/2-jenkins.sh
index b8bcf77..dc54f0f 100755
--- a/2-jenkins.sh
+++ b/2-jenkins.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
@@ -16,7 +16,7 @@ INITIAL_PASSWORD_FILE="/var/lib/jenkins/secrets/initialAdminPassword"
 NETWORK_INTERFACES=`ls /sys/class/net/ -1 |grep -v -w "lo" |grep -v docker |grep -v dummy |grep -v veth`
 
 #region Run SSH script
-cp install-files/ssh-script.sh /var/lib/jenkins
+cp ./auto/ssh-script.sh /var/lib/jenkins
 chown jenkins:jenkins /var/lib/jenkins/ssh-script.sh
 
 # This script create the SSH key, adds it to the trusted keys and trusts the host itself.
@@ -28,7 +28,7 @@ rm /var/lib/jenkins/ssh-script.sh > /dev/null 2>&1
 #endregion
 
 #region Run GnuPG script
-cp install-files/gpg-script.sh /var/lib/jenkins
+cp ./auto/gpg-script.sh /var/lib/jenkins
 chown jenkins:jenkins /var/lib/jenkins/gpg-script.sh
 
 # This script generates the GnuPG key pair.
@@ -235,7 +235,7 @@ fi
 # Sometimes the GlobalLibraries config file isn't there yet.
 if [ ! -f $JENKINS_GLOBALLIBRARIES_FILE ]; then
   # If that is the case, we copy a clean config into where it should be.
-  cp install-files/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml $JENKINS_GLOBALLIBRARIES_FILE
+  cp ./auto/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml $JENKINS_GLOBALLIBRARIES_FILE
 fi
 
 # Is the Global Libraries configured?
@@ -281,7 +281,7 @@ fi
 # Sometimes the Docker Declarative config file isn't there yet.
 if [ ! -f $JENKINS_DOCKERDECLARATIVE_FILE ]; then
   # If that is the case, we copy a clean config into where it should be.
-  cp install-files/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml $JENKINS_DOCKERDECLARATIVE_FILE
+  cp ./auto/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml $JENKINS_DOCKERDECLARATIVE_FILE
 fi
 
 # Is the Docker Declarative plugin configured?
diff --git a/3-repositories.sh b/3-repositories.sh
index 962efaf..384a71d 100755
--- a/3-repositories.sh
+++ b/3-repositories.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
diff --git a/4-uncron.sh b/4-uncron.sh
index fb3ce00..f5076bf 100755
--- a/4-uncron.sh
+++ b/4-uncron.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
@@ -12,7 +12,7 @@ EnsureRoot
 EnsureStageIsComplete 3
 
 #region Run Uncron script
-cp install-files/uncron-script.sh /var/lib/jenkins
+cp ./auto/uncron-script.sh /var/lib/jenkins
 chown jenkins:jenkins /var/lib/jenkins/uncron-script.sh
 
 # This script builds the uncron package.
@@ -43,7 +43,7 @@ if [ -f /etc/systemd/system/uncron.service ]; then
   PrintOkIndicator "SystemD service file has already been copied."
 else
   function CopySystemDServiceFile {
-    cp ./install-files/uncron.service /etc/systemd/system
+    cp ./auto/uncron.service /etc/systemd/system
   }
 
   Run "CopySystemDServiceFile" \
@@ -58,7 +58,7 @@ if [ -f /usr/local/bin/uncron-add ]; then
   PrintOkIndicator "Uncron Add has already been installed."
 else
   function InstallUncronAdd {
-    cp ./install-files/uncron-add /usr/local/bin
+    cp ./auto/uncron-add /usr/local/bin
     chmod +x /usr/local/bin/uncron-add
     chmod +x /var/lib/jenkins/uncron/src/uncron-add
   }
diff --git a/5-docker-jobs.sh b/5-docker-jobs.sh
index b9cd376..57640dd 100755
--- a/5-docker-jobs.sh
+++ b/5-docker-jobs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
diff --git a/6-provision-project-jobs.sh b/6-provision-project-jobs.sh
index 8b89cd8..876fd93 100755
--- a/6-provision-project-jobs.sh
+++ b/6-provision-project-jobs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
diff --git a/7-build-project-jobs.sh b/7-build-project-jobs.sh
index 7623f12..4749bda 100755
--- a/7-build-project-jobs.sh
+++ b/7-build-project-jobs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
diff --git a/8-nginx.sh b/8-nginx.sh
index 97125d4..7fe268c 100755
--- a/8-nginx.sh
+++ b/8-nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen and print the header
 PrintHeader
@@ -40,7 +40,7 @@ if [ -f /etc/nginx/sites-available/apt-mirror ]; then
 fi
 
 function CopyAvailableSiteFile {
-  cp install-files/nginx-site /etc/nginx/sites-available/apt-mirror
+  cp ./auto/nginx-site /etc/nginx/sites-available/apt-mirror
 }
 
 Run "CopyAvailableSiteFile" \
diff --git a/install-files/daemon.json b/auto/daemon.json
index f71dd61..f71dd61 100644
--- a/install-files/daemon.json
+++ b/auto/daemon.json
diff --git a/install-files/dummy0.interface b/auto/dummy0.interface
index a45fcf8..a45fcf8 100644
--- a/install-files/dummy0.interface
+++ b/auto/dummy0.interface
diff --git a/install-files/gpg-script.sh b/auto/gpg-script.sh
index 2e26668..2e26668 100755
--- a/install-files/gpg-script.sh
+++ b/auto/gpg-script.sh
diff --git a/helper-logic b/auto/helper-logic
index a1f6c17..bcd10ef 100644
--- a/helper-logic
+++ b/auto/helper-logic
@@ -581,4 +581,4 @@ function EnsureStageIsComplete {
     echo -e "${RED}Stage ${1} has not been completed - please run that first.${NOCOLOR}"
     exit
   fi
-}
\ No newline at end of file
+}
diff --git a/install-files/nginx-site b/auto/nginx-site
index 56550e5..56550e5 100644
--- a/install-files/nginx-site
+++ b/auto/nginx-site
diff --git a/install-files/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml b/auto/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml
index 40faa75..40faa75 100644
--- a/install-files/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml
+++ b/auto/org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig.xml
diff --git a/install-files/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml b/auto/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
index 859b10e..859b10e 100644
--- a/install-files/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
+++ b/auto/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
diff --git a/install-files/ssh-script.sh b/auto/ssh-script.sh
index abdf7ae..abdf7ae 100755
--- a/install-files/ssh-script.sh
+++ b/auto/ssh-script.sh
diff --git a/install-files/uncron-add b/auto/uncron-add
index 298fd3c..298fd3c 100755
--- a/install-files/uncron-add
+++ b/auto/uncron-add
diff --git a/install-files/uncron-script.sh b/auto/uncron-script.sh
index 3dd1916..3dd1916 100755
--- a/install-files/uncron-script.sh
+++ b/auto/uncron-script.sh
diff --git a/install-files/uncron.service b/auto/uncron.service
index 8f3290a..8f3290a 100644
--- a/install-files/uncron.service
+++ b/auto/uncron.service
diff --git a/build-iso.sh b/build-iso.sh
index 9db724f..c9a4598 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./helper-logic
+source ./auto/helper-logic
 
 # Clear the screen first
 clear