Merge pull request #143 from wsoula/fix-jaas-auth

Fix JAAS auth
jjethwa · Aug 3, 2018 · ca2fd2b · ca2fd2b
2 parents f44d7de + e22b504
commit ca2fd2b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/content/opt/rundeck-defaults/profile b/content/opt/rundeck-defaults/profile
@@ -34,7 +34,7 @@ RDECK_JVM_SETTINGS="${RDECK_JVM_SETTINGS:- -Xmx1024m -Xms256m -XX:MaxMetaspaceSi
 RDECK_TRUSTSTORE_FILE="${RDECK_TRUSTSTORE_FILE:-$RDECK_CONFIG/ssl/truststore}"
 RDECK_TRUSTSTORE_TYPE="${RDECK_TRUSTSTORE_TYPE:-jks}"
 JAAS_LOGIN="${JAAS_LOGIN:-true}"
-JAAS_CONF="${JAAS_CONF:-$RDECK_CONFIG/jaas-loginmodule.conf}"
+JAAS_CONF_FILE="${JAAS_CONF_FILE:-jaas-loginmodule.conf}"
 LOGIN_MODULE="${LOGIN_MODULE:-RDpropertyfilelogin}"
 RDECK_HTTP_PORT=${RDECK_HTTP_PORT:-4440}
 RDECK_HTTPS_PORT=${RDECK_HTTPS_PORT:-4443}
@@ -58,7 +58,7 @@ for war in $(find $RDECK_INSTALL/bootstrap -name '*.war') ; do
 done
 
 RDECK_JVM="-Drundeck.jaaslogin=$JAAS_LOGIN \
-           -Dloginmodule.conf.name=$JAAS_CONF \
+           -Dloginmodule.conf.name=$JAAS_CONF_FILE \
            -Dloginmodule.name=$LOGIN_MODULE \
            -Drdeck.config=$RDECK_CONFIG \
            -Drundeck.server.configDir=$RDECK_SERVER_CONFIG \