hms-dbmi · Luke-Sikina · Jun 7, 2024 · Jul 12, 2024 · Jul 12, 2024 · Jul 12, 2024
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 .project
 *.iml
 initial-configuration/mysql-docker/.env
+pass.tmp
+initial-configuration/pass.tmp
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ you exact instructions. If you're following the legacy install instructions, you
 `cd pic-sure-all-in-one/initial-configuration`
 Choose one of the following use cases:
 - *Fully dockerized install.* Our current happy path.
-`sudo ./install-dependencies-docker.sh /path/to/desired/config/dir/ && source ~/.bashrc`
+`sudo ./install-dependencies-docker.sh /path/to/desired/config/dir/ /path/to/desired/mysql/cnf/dir && source ~/.bashrc`
 - *Legacy install.* I know what I'm doing. `sudo ./install-dependencies.sh`
 - *Jenkins on https.* This is rare:
 ```shell
@@ -131,6 +131,7 @@ Once you have logged into Jenkins and have set up your admin account, you need t
 system variables:
 
 - `DOCKER_CONFIG_DIR`: `/path/to/config/dir` This is the path you passed to `install-dependencies-docker`
+- `MYSQL_CONFIG_DIR`: `/path/to/mysql/cnf/dir` This is the path you passed to `install-dependencies-docker`
 - `MYSQL_NETWORK`: `picsure` If you plan to switch to a remote database, this needs to be changed back to `host`
 
 6. Run the Initial Configuration Pipeline job.

diff --git a/initial-configuration/config/httpd/httpd-vhosts-ssloffload.conf b/initial-configuration/config/httpd/httpd-vhosts-ssloffload.conf
@@ -34,7 +34,7 @@ Listen 0.0.0.0:80
     </LocationMatch>
 
     RewriteRule ^/picsure/(.*)$ "http://wildfly:8080/pic-sure-api-2/PICSURE/$1" [P]
-    RewriteRule ^/psama/(.*)$ "http://wildfly:8080/pic-sure-auth-services/auth/$1" [P]
+    RewriteRule ^/psama/(.*)$ "http://psama:8090/auth/$1" [P]
 
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-d

diff --git a/initial-configuration/config/httpd/httpd-vhosts.conf b/initial-configuration/config/httpd/httpd-vhosts.conf
@@ -88,7 +88,7 @@ ServerTokens Prod
     </LocationMatch>
 
     RewriteRule ^/picsure/(.*)$ "http://wildfly:8080/pic-sure-api-2/PICSURE/$1" [P]
-    RewriteRule ^/psama/(.*)$ "http://wildfly:8080/pic-sure-auth-services/auth/$1" [P]
+    RewriteRule ^/psama/(.*)$ "http://psama:8090/auth/$1" [P]
 
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
     RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-d

diff --git a/initial-configuration/config/httpd/picsureui_settings.json b/initial-configuration/config/httpd/picsureui_settings.json
@@ -26,7 +26,7 @@
   "customizeAuth0Login": true,
   "queryButtonLabel": "Export for analysis",
   "maxVariantCount": 10000,
-  "auth0domain":"__AUTH0_DOMAIN__",
+  "auth0domain":"__AUTH0_TENANT__",
   "client_id":"__PIC_SURE_CLIENT_ID__",
   "analyticsId": "__ANALYTICS_ID__",
   "tagManagerId": "__TAG_MANAGER_ID__"

diff --git a/initial-configuration/config/httpd/psamaui_settings.json b/initial-configuration/config/httpd/psamaui_settings.json
@@ -6,7 +6,7 @@
   "basePath" : "/psama",
   "uiPath": "",
   "customizeAuth0Login": true,
-  "auth0domain":"__AUTH0_DOMAIN__",
+  "auth0domain":"__AUTH0_TENANT__",
   "client_id":"__PIC_SURE_CLIENT_ID__"
 }
 
diff --git a/initial-configuration/config/psama/.env b/initial-configuration/config/psama/.env
@@ -0,0 +1,28 @@
+# Database Configuration
+DATASOURCE_URL=jdbc:mysql://picsure-db:3306/auth?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true&serverTimezone=UTC
+DATASOURCE_USERNAME=auth
+DATASOURCE_PASSWORD=__AUTH_MYSQL_PASSWORD__
+
+# Mail Configuration
+EMAIL_ADDRESS=__EMAIL_FROM_ADDR__
+EMAIL_PASSWORD=__EMAIL_PASSWORD__
+
+# Application Properties
+APPLICATION_CLIENT_SECRET=__PIC_SURE_CLIENT_SECRET__
+APPLICATION_CLIENT_SECRET_IS_BASE_64=false
+TOS_ENABLED=false
+SYSTEM_NAME=PIC-SURE All-in-one
+GRANT_EMAIL_SUBJECT=__ACCESS_GRANTED_EMAIL_SUBJECT__
+USER_ACTIVATION_REPLY_TO=__USER_ACTIVATION_REPLY_TO__
+ADMIN_USERS=__ADMIN_USERS__
+DENIED_EMAIL_ENABLED=false
+STACK_SPECIFIC_APPLICATION_ID=__STACK_SPECIFIC_APPLICATION_ID__
+
+# IDP Provider Configuration
+AUTH0_IDP_PROVIDER_IS_ENABLED=true
+IDP_PROVIDER_URI=https://__AUTH0_TENANT__.auth0.com/
+AUTH0_HOST=https://__AUTH0_TENANT__.auth0.com/
+
+# Token Expiration Times
+TOKEN_EXPIRATION_TIME=3600000
+LONG_TERM_TOKEN_EXPIRATION_TIME=2592000000
diff --git a/initial-configuration/config/wildfly/standalone.xml b/initial-configuration/config/wildfly/standalone.xml
@@ -158,26 +158,6 @@
                         <password>sa</password>
                     </security>
                 </datasource>
-                <datasource jndi-name="java:jboss/datasources/AuthDS" pool-name="AuthDS" use-java-context="true">
-                    <connection-url>jdbc:mysql://picsure-db:3306/auth?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true&amp;serverTimezone=UTC</connection-url>
-                    <driver>mysql</driver>
-                    <pool>
-                        <min-pool-size>2</min-pool-size>
-                        <max-pool-size>10</max-pool-size>
-                        <prefill>true</prefill>
-                    </pool>
-                    <security>
-                        <user-name>auth</user-name>
-                        <password>__AUTH_MYSQL_PASSWORD__</password>
-                    </security>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-                        <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
-                        <validate-on-match>true</validate-on-match>
-                        <background-validation>false</background-validation>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/>
-                    </validation>
-                </datasource>
                 <datasource jndi-name="java:jboss/datasources/PicsureDS" pool-name="PicsureDS" use-java-context="true">
                     <connection-url>jdbc:mysql://picsure-db:3306/picsure?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;autoReconnectForPools=true&amp;serverTimezone=UTC</connection-url>
                     <driver>mysql</driver>
@@ -461,7 +441,11 @@
                 <simple name="java:global/roles_claim" value="privileges"/>
                 <!-- Used in IRCT as well -->
                 <simple name="java:global/verify_user_method" value="tokenIntrospection"/>
-                <simple name="java:global/token_introspection_url" value="http://wildfly:8080/pic-sure-auth-services/auth/token/inspect"/>
+                <simple name="java:global/token_introspection_url" value="http://psama:8090/auth/token/inspect"/>
+
+                <simple name="java:global/openAccessEnabled" value="true"/>
+                <simple name="java:global/openAccessValidateUrl" value="http://psama:8090/auth/open/validate"/>
+
                 <simple name="java:global/token_introspection_token" value="__PIC_SURE_TOKEN_INTROSPECTION_TOKEN__"/>
                <!-- psama configuration-->
                 <simple name="java:global/client_secret" value="__PIC_SURE_CLIENT_SECRET__"/>
@@ -475,7 +459,7 @@
                 <simple name="java:global/userActivationReplyTo" value="__USER_ACTIVATION_REPLY_TO__"/>
                 <simple name="java:global/templatePath" value="/opt/jboss/wildfly/standalone/configuration/emailTemplates/" />
                 <simple name="java:global/tosEnabled" value="False" />
-                <simple name="java:global/auth0host" value="https://__AUTH0_DOMAIN__.auth0.com/" />
+                <simple name="java:global/auth0host" value="https://__AUTH0_TENANT__.auth0.com/" />
                 <simple name="java:global/emailTemplatePath" value="/opt/jboss/wildfly/standalone/configuration/emailTemplates/" />
                 <simple name="java:global/accessGrantEmailSubject" value="__ACCESS_GRANTED_EMAIL_SUBJECT__" />
                 <simple name="java:global/deniedEmailEnabled" value="false" />

diff --git a/initial-configuration/install-dependencies-docker.sh b/initial-configuration/install-dependencies-docker.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bash
 
 sed_inplace() {
@@ -8,7 +7,6 @@ sed_inplace() {
     sed -i "$@"
   fi
 }
-export -f sed_inplace
 
 CWD=$(pwd)
 # this makes tr work on OSX
@@ -45,7 +43,28 @@ function set_docker_config_dir {
   echo 'alias picsure-db="docker exec -ti picsure-db bash -c '\''mysql -uroot -p\$MYSQL_ROOT_PASSWORD'\''"' >> "$rc_file"
 }
 
+function set_mysql_config_dir() {
+  local mysql_config_dir=$1
+  if [ -z "$mysql_config_dir" ]; then
+    mysql_config_dir="$DOCKER_CONFIG_DIR/picsure-db/"
+  fi
+  #Check if mysql_config_dir is a dir and exists
+  if [ ! -d "$mysql_config_dir" ]; then
+    echo "Creating dir $mysql_config_dir and setting MYSQL_CONFIG_DIR in $rc_file"
+    mkdir -p $mysql_config_dir
+    export MYSQL_CONFIG_DIR=$mysql_config_dir
+    echo "export MYSQL_CONFIG_DIR=$mysql_config_dir" >> "$rc_file"
+  else
+    echo "dir $mysql_config_dir exists, just setting MYSQL_CONFIG_DIR in $rc_file"
+    # If the config dir exists, we still want to clean up old settings for it
+    export MYSQL_CONFIG_DIR=$1
+    grep 'MYSQL_CONFIG_DIR' "$rc_file" && sed_inplace '/MYSQL_CONFIG_DIR/d' "$rc_file"
+    echo "export MYSQL_CONFIG_DIR=$mysql_config_dir" >> "$rc_file"
+  fi
+}
+
 set_docker_config_dir "$1"
+set_mysql_config_dir "$2"
 
 #-------------------------------------------------------------------------------------------------#
 #                                          Docker Install                                         #
@@ -56,7 +75,7 @@ echo "Starting update"
 echo "Installing docker"
 if [ -n "$(command -v yum)" ] && [ -z "$(command -v docker)" ]; then
   echo "Yum detected. Assuming RHEL. Install commands will use yum"
-  set_docker_config_dir $1  "$HOME/.zshrc"
+  set_docker_config_dir $1 "$HOME/.zshrc"
   yum -y update
   # This repo can be removed after we move away from centos 7 I think
   yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
@@ -90,7 +109,7 @@ if [ -n "$(command -v apt-get)" ] && [ -z "$(command -v docker)" ]; then
 fi
 
 if [[ "$OSTYPE" =~ ^darwin ]]; then
-    echo "Darwin detected. Assuming macOS. Install commands will use brew." 
+    echo "Darwin detected. Assuming macOS. Install commands will use brew."
     #check for brew
     if [ -z "$(command -v brew)" ]; then
       echo "Brew not detected. Please install brew and rerun this script."
@@ -112,7 +131,7 @@ fi
 if [ -n "$(command -v apk)" ]; then
   echo "apk detected. Assuming alpine. Install commands will use apk"
   apk update && apk add --no-cache wget
-fi 
+fi
 
 if [ -z "$(command -v docker)" ]; then
   echo "You dont have docker installed and we cant detect a supported package manager."
@@ -172,11 +191,13 @@ export APP_ID=`uuidgen | tr '[:upper:]' '[:lower:]'`
 export APP_ID_HEX=`echo $APP_ID | awk '{ print toupper($0) }'|sed 's/-//g'`
 sed_inplace "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" $DOCKER_CONFIG_DIR/httpd/picsureui_settings.json
 sed_inplace "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" $DOCKER_CONFIG_DIR/wildfly/standalone.xml
+sed_inplace "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" $DOCKER_CONFIG_DIR/psama/.env
 
 export RESOURCE_ID=`uuidgen | tr '[:upper:]' '[:lower:]'`
 export RESOURCE_ID_HEX=`echo $RESOURCE_ID | awk '{ print toupper($0) }'|sed 's/-//g'`
 sed_inplace "s/__STACK_SPECIFIC_RESOURCE_UUID__/$RESOURCE_ID/g" $DOCKER_CONFIG_DIR/httpd/picsureui_settings.json
 
+
 echo $APP_ID > $DOCKER_CONFIG_DIR/APP_ID_RAW
 echo $APP_ID_HEX > $DOCKER_CONFIG_DIR/APP_ID_HEX
 echo $RESOURCE_ID > $DOCKER_CONFIG_DIR/RESOURCE_ID_RAW

diff --git a/initial-configuration/install-dependencies.sh b/initial-configuration/install-dependencies.sh
@@ -87,7 +87,7 @@ rm -f picsure.tmp
 
 echo "` < /dev/urandom tr -dc @^=+$*%_A-Z-a-z-0-9 | head -c${1:-24}`%4cA" > auth.tmp
 mysql -u root -e "grant all privileges on auth.* to 'auth'@'%' identified by '`cat auth.tmp`';flush privileges;";
-sed -i s/__AUTH_MYSQL_PASSWORD__/`cat auth.tmp`/g /usr/local/docker-config/wildfly/standalone.xml
+sed -i s/__AUTH_MYSQL_PASSWORD__/`cat auth.tmp`/g /usr/local/docker-config/psama/.env
 rm -f auth.tmp
 
 echo "Building and installing Jenkins"
@@ -109,6 +109,7 @@ export APP_ID=`uuidgen -r`
 export APP_ID_HEX=`echo $APP_ID | awk '{ print toupper($0) }'|sed 's/-//g'`
 sed -i "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" /usr/local/docker-config/httpd/picsureui_settings.json
 sed -i "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" /usr/local/docker-config/wildfly/standalone.xml
+sed -i "s/__STACK_SPECIFIC_APPLICATION_ID__/$APP_ID/g" /usr/local/docker-config/psama/.env
 
 export RESOURCE_ID=`uuidgen -r`
 export RESOURCE_ID_HEX=`echo $RESOURCE_ID | awk '{ print toupper($0) }'|sed 's/-//g'`

diff --git a/initial-configuration/jenkins/jenkins-docker/config.xml b/initial-configuration/jenkins/jenkins-docker/config.xml
@@ -139,6 +139,7 @@
         <string>Backup Jenkins Home</string>
         <string>Create PIC-SURE PassThrough Resource</string>
         <string>Create PIC-SURE Aggregate Resource</string>
+        <string>Create PIC-SURE Visualization Build</string>
         <string>Retrieve Build Spec</string>
       </jobNames>
       <jobFilters/>
@@ -153,6 +154,32 @@
       </columns>
       <recurse>false</recurse>
     </listView>
+    <listView>
+      <owner class="hudson" reference="../../.."/>
+      <name>Dictionary</name>
+      <filterExecutors>false</filterExecutors>
+      <filterQueue>false</filterQueue>
+      <properties class="hudson.model.View$PropertyList"/>
+      <jobNames>
+        <comparator class="java.lang.String$CaseInsensitiveComparator"/>
+        <string>Build Dictionary API</string>
+        <string>Deploy Dictionary API</string>
+        <string>Upload Dictionary .env File</string>
+        <string>Edit Dictionary .env</string>
+        <string>Weight Dictionary Search Fields</string>
+      </jobNames>
+      <jobFilters/>
+      <columns>
+        <hudson.views.StatusColumn/>
+        <hudson.views.WeatherColumn/>
+        <hudson.views.JobColumn/>
+        <hudson.views.LastSuccessColumn/>
+        <hudson.views.LastFailureColumn/>
+        <hudson.views.LastDurationColumn/>
+        <hudson.views.BuildButtonColumn/>
+      </columns>
+      <recurse>false</recurse>
+    </listView>
   </views>
   <primaryView>Deployment</primaryView>
   <slaveAgentPort>50000</slaveAgentPort>
@@ -169,7 +196,7 @@
           <default>
             <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../../../../views/listView/jobNames/comparator"/>
           </default>
-          <int>6</int>
+          <int>7</int>
           <string>project_specific_override_repo</string>
           <string>__PROJECT_SPECIFIC_OVERRIDE_REPO__</string>
           <string>release_control_branch</string>
@@ -182,6 +209,8 @@
           <string>/usr/local/docker-config/</string>
           <string>MYSQL_NETWORK</string>
           <string>host</string>
+          <string>MYSQL_CONFIG_DIR</string>
+          <string>/usr/local/docker-config/picsure-db/</string>
         </tree-map>
       </envVars>
     </hudson.slaves.EnvironmentVariablesNodeProperty>

diff --git a/initial-configuration/jenkins/jenkins-docker/jobs/Build Dictionary API/config.xml b/initial-configuration/jenkins/jenkins-docker/jobs/Build Dictionary API/config.xml
@@ -0,0 +1,56 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Build the Dictionary API Container</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>pipeline_build_id</name>
+          <defaultValue>MANUAL_RUN</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>git_hash</name>
+          <defaultValue>origin/main</defaultValue>
+          <trim>true</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@5.2.2">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>https://github.com/hms-dbmi/picsure-dictionary.git</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>${git_hash}</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="empty-list"/>
+    <extensions/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>current_git_tag=$(git tag --points-at HEAD)
+if [ -z &quot;${current_git_tag}&quot;]; then
+	current_git_tag=$(git log --pretty=format:&apos;%h&apos; -n 1)
+fi
+docker build . -t &quot;avillach/dictionary-api:$current_git_tag&quot;</command>
+      <configuredLocalRules/>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
diff --git a/initial-configuration/jenkins/jenkins-docker/jobs/Build and Deploy Microservice/config.xml b/initial-configuration/jenkins/jenkins-docker/jobs/Build and Deploy Microservice/config.xml
@@ -56,20 +56,20 @@
     <hudson.tasks.Shell>
       <command># Get the resource from the db if it exists
 export SQL=&quot;SELECT LOWER(CONCAT(SUBSTR(HEX(uuid), 1, 8), &apos;-&apos;, SUBSTR(HEX(uuid), 9, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 13, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 17, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 21))) from picsure.resource where name = &apos;$service_name&apos;&quot;;
-export resource_uuid=$(docker run -i -v /root/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -se &quot;$SQL&quot; picsure);
+export resource_uuid=$(docker run -i -v $MYSQL_CONFIG_DIR/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -se &quot;$SQL&quot; picsure);
 
 # Add the resource to the database if it doesn&apos;t already exist
 if [ -z &quot;$resource_uuid&quot; ]; then
 	echo &apos;This is the first time building this resource. Adding to db&apos;
     echo &apos;&apos;
 	export SQL=&quot;INSERT IGNORE INTO picsure.resource (uuid, name, resourceRSPath, description) \
 	VALUES (UUID(), &apos;$service_name&apos;, &apos;http://$service_name/&apos;, &apos;$service_description&apos;)&quot;;
-	docker run -i -v /root/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -e &quot;$SQL&quot; picsure
+	docker run -i -v $MYSQL_CONFIG_DIR/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -e &quot;$SQL&quot; picsure
 fi
 
 # Get the resource from the db 
 export SQL=&quot;SELECT LOWER(CONCAT(SUBSTR(HEX(uuid), 1, 8), &apos;-&apos;, SUBSTR(HEX(uuid), 9, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 13, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 17, 4), &apos;-&apos;, SUBSTR(HEX(uuid), 21))) from picsure.resource where name = &apos;$service_name&apos;&quot;;
-export resource_uuid=$(docker run -i -v /root/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -se &quot;$SQL&quot; picsure);
+export resource_uuid=$(docker run -i -v $MYSQL_CONFIG_DIR/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -se &quot;$SQL&quot; picsure);
 echo &apos;&apos;
 echo &quot;Done adding to db. Using $resource_uuid as uuid&quot;; 
 

diff --git a/initial-configuration/jenkins/jenkins-docker/jobs/Configure Auth0 Integration/config.xml b/initial-configuration/jenkins/jenkins-docker/jobs/Configure Auth0 Integration/config.xml
@@ -46,6 +46,9 @@ sed -i &quot;s/$old_client_id/$AUTH0_CLIENT_ID/g&quot; /usr/local/docker-config/
 sed -i &quot;s/$old_tenant/$AUTH0_TENANT/g&quot; /usr/local/docker-config/httpd/picsureui_settings.json
 sed -i &quot;s/$old_tenant/$AUTH0_TENANT/g&quot; /usr/local/docker-config/wildfly/standalone.xml
 
+sed -i &quot;s/$old_client_secret/$AUTH0_CLIENT_SECRET/g&quot; /usr/local/docker-config/psama/.env
+sed -i &quot;s/$old_client_id/$AUTH0_CLIENT_ID/g&quot; /usr/local/docker-config/psama/.env
+sed -i &quot;s/$old_tenant/$AUTH0_TENANT/g&quot; /usr/local/docker-config/psama/.env
 </command>
     </hudson.tasks.Shell>
   </builders>

diff --git a/...ion/jenkins/jenkins-docker/jobs/Configure JupyterHub Token Introspection Token/config.xml b/...ion/jenkins/jenkins-docker/jobs/Configure JupyterHub Token Introspection Token/config.xml
@@ -50,7 +50,7 @@ export old_token_introspection_token=`cat /usr/local/docker-config/jupyterhub_co
 
 sed -i &quot;s/$old_token_introspection_token/$new_token_introspection_token/g&quot; /usr/local/docker-config/jupyterhub_config.py
 
-docker run -i -v /root/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -e \
+docker run -i -v $MYSQL_CONFIG_DIR/.my.cnf:/root/.my.cnf --network=${MYSQL_NETWORK:-host} mysql mysql -e \
 &quot;update application set token=&apos;$new_token_introspection_token&apos; where uuid=$application_id;&quot; auth
 </command>
     </hudson.tasks.Shell>