Merge pull request #92 from lsst-sqre/tickets/DM-40477

[DM-40477] Make configuration closer to postgres tap
lsst-sqre · Aug 29, 2023 · 1923b23 · 1923b23
2 parents e840354 + 0efa17f
commit 1923b23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     networks:
       - tap-network
     environment:
-      CATALINA_OPTS: "-Dqservuser.jdbc.username=qsmaster -Dqservuser.jdbc.password= -Dqservuser.jdbc.driverClassName=com.mysql.cj.jdbc.Driver -Dqservuser.jdbc.url=jdbc:mysql://mock-qserv:3306/ -Dtapuser.jdbc.username=TAP_SCHEMA -Dtapuser.jdbc.password=TAP_SCHEMA -Dtapuser.jdbc.driverClassName=com.mysql.cj.jdbc.Driver -Dtapuser.jdbc.url=jdbc:mysql://tap-schema-db:3306/ -Dca.nrc.cadc.reg.client.RegistryClient.local=true -Duws.jdbc.username=postgres -Duws.jdbc.driverClassName=org.postgresql.Driver -Duws.jdbc.url=jdbc:postgresql://uws-db/ -Dca.nrc.cadc.auth.Authenticator=org.opencadc.tap.impl.AuthenticatorImpl -Dca.nrc.cadc.util.PropertiesReader.dir=/etc/creds/"
+      CATALINA_OPTS: "-Dqservuser.username=qsmaster -Dqservuser.password= -Dqservuser.driverClassName=com.mysql.cj.jdbc.Driver -Dqservuser.url=jdbc:mysql://mock-qserv:3306/ -Dtapschemauser.username=TAP_SCHEMA -Dtapschemauser.password=TAP_SCHEMA -Dtapschemauser.driverClassName=com.mysql.cj.jdbc.Driver -Dtapschemauser.url=jdbc:mysql://tap-schema-db:3306/ -Dca.nrc.cadc.reg.client.RegistryClient.local=true -Duws.username=postgres -Duws.driverClassName=org.postgresql.Driver -Duws.url=jdbc:postgresql://uws-db/ -Dca.nrc.cadc.auth.Authenticator=org.opencadc.tap.impl.AuthenticatorImpl -Dca.nrc.cadc.util.PropertiesReader.dir=/etc/creds/"
       GOOGLE_APPLICATION_CREDENTIALS: "/etc/google_creds.json"
     volumes:
       - './google_creds.json:/etc/google_creds.json'

diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
@@ -7,10 +7,10 @@
               type="javax.sql.DataSource"
               factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
               minEvictableIdleTimeMillis="30000"
-              maxActive="${tapuser.maxActive}" maxIdle="10" maxWait="20000" initialSize="5"
-              username="${tapuser.jdbc.username}" password="${tapuser.jdbc.password}"
-              driverClassName="${tapuser.jdbc.driverClassName}"
-              url="${tapuser.jdbc.url}"
+              maxActive="${tapschemauser.maxActive}" maxIdle="10" maxWait="20000" initialSize="5"
+              username="${tapschemauser.username}" password="${tapschemauser.password}"
+              driverClassName="${tapschemauser.driverClassName}"
+              url="${tapschemauser.url}"
               removeAbandoned="false"
               logAbandoned="true"
               testOnBorrow="true"
@@ -25,9 +25,9 @@
               factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
               minEvictableIdleTimeMillis="30000"
               maxActive="${qservuser.maxActive}" maxIdle="1" maxWait="20000" initialSize="5"
-              username="${qservuser.jdbc.username}" password="${qservuser.jdbc.password}"
-              driverClassName="${qservuser.jdbc.driverClassName}"
-              url="${qservuser.jdbc.url}"
+              username="${qservuser.username}" password="${qservuser.password}"
+              driverClassName="${qservuser.driverClassName}"
+              url="${qservuser.url}"
               removeAbandoned="false"
               logAbandoned="true"
               testOnBorrow="true"
@@ -42,9 +42,9 @@
               factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
               minEvictableIdleTimeMillis="30000"
               maxActive="1" maxIdle="1" maxWait="20000" initialSize="1" minIdle="1"
-              username="${uws.jdbc.username}" password="${uws.jdbc.password}"
-              driverClassName="${uws.jdbc.driverClassName}"
-              url="${uws.jdbc.url}"
+              username="${uws.username}" password="${uws.password}"
+              driverClassName="${uws.driverClassName}"
+              url="${uws.url}"
               removeAbandoned="false"
               removeAbandonedTimeout="600"
               logAbandoned="true"