More changes to prepare for removal of cargo

UAA Boot application no longer relies on the `scripts/cargo` directory

Author: fhanik

scripts/boot/application.yml

@@ -9,7 +9,7 @@ server:
   port: 8443
   max-http-header-size: 14336
   tomcat:
-    basedir: "${uaa.location.tomcat}"
+    basedir: "${uaa.boot.location.tomcat}"
     connection-timeout: 20000
     keep-alive-timeout: 120000
     remoteip:
@@ -19,7 +19,7 @@ server:
       port-header: "X-Forwarded-Port"
     accesslog:
       enabled: true
-      directory: "${uaa.location.tomcat}"
+      directory: "${uaa.boot.location.tomcat}"
       prefix: "localhost_access"
       suffix: ".log"
       rotate: false
@@ -29,7 +29,7 @@ server:
     enabled-protocols: "TLSv1.2,TLSv1.3"
     ciphers: "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384"
     protocol: TLS
-    key-store: "${uaa.location.certificate}/uaa_keystore.p12"
+    key-store: "${uaa.boot.location.certificate}/uaa_keystore.p12"
     key-store-type: "PKCS12"
     key-alias: "uaa_ssl_cert"
     key-store-password: "k0*l*s3cur1tyr0ck$"

scripts/boot/boot-with-tls.sh

@@ -35,8 +35,8 @@ fi
 pushd ${SCRIPT_DIR}
   java \
       -Dlogging.level.org.springframework.security=TRACE \
-      -Duaa.location.tomcat=${ROOT_DIR}/scripts/boot/tomcat \
-      -Duaa.location.certificate=${ROOT_DIR}/scripts/certificates \
+      -Duaa.boot.location.tomcat=${ROOT_DIR}/scripts/boot/tomcat \
+      -Duaa.boot.location.certificate=${ROOT_DIR}/scripts/certificates \
       -Dlogging.config=${ROOT_DIR}/scripts/boot/log4j2.properties \
       -DCLOUDFOUNDRY_CONFIG_PATH=${ROOT_DIR}/scripts/cargo \
       -DSECRETS_DIR=${ROOT_DIR}/scripts/cargo \

uaa/build.gradle

@@ -237,9 +237,8 @@ bootRun {
     dependsOn rootProject.cleanBootTomcatDir
     mainClass = "org.cloudfoundry.experimental.boot.UaaBootApplication"
     systemProperty("logging.level.org.springframework.security", "TRACE")
-    systemProperty("server.tomcat.basedir", file("../scripts/boot/tomcat/").getAbsolutePath())
     systemProperty("logging.config", file("../scripts/boot/log4j2.properties").getAbsolutePath())
-    systemProperty("SECRETS_DIR", System.getProperty("SECRETS_DIR", file("../scripts/cargo").getAbsolutePath()))
+    systemProperty("uaa.boot.location.tomcat", System.getProperty("uaa.boot.location.tomcat", file("../scripts/boot/tomcat").getAbsolutePath()))
     systemProperty("spring.profiles.active", System.getProperty("spring.profiles.active", "hsqldb"))
     systemProperty("metrics.perRequestMetrics", System.getProperty("metrics.perRequestMetrics", "true"))
     systemProperty("smtp.host", "localhost")