Skip to content

Commit 05b5a46

Browse files
authored
[ENG-11116] Update cas.properties for JPA / DB access (#114)
* Update cas.properties for JPA / DB access * Use env var wi/ default val for autocommit and ddl-auto
1 parent 004d08f commit 05b5a46

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

etc/cas/config/cas.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ cas.authn.osf-postgres.order=0
142142
cas.authn.osf-postgres.jpa.user=${OSF_DB_USER:postgres}
143143
cas.authn.osf-postgres.jpa.password=${OSF_DB_PASSWORD:}
144144
cas.authn.osf-postgres.jpa.driver-class=${OSF_DB_DRIVER_CLASS:org.postgresql.Driver}
145-
cas.authn.osf-postgres.jpa.url=${OSF_DB_URL:jdbc:postgresql://192.168.168.167:5432/osf?targetServerType=master&readOnly=true}
145+
cas.authn.osf-postgres.jpa.url=${OSF_DB_URL:jdbc:postgresql://192.168.168.167:5432/osf?targetServerType=preferSecondary&readOnly=true&readOnlyMode=always}
146146
cas.authn.osf-postgres.jpa.dialect=${OSF_DB_HIBERNATE_DIALECT:io.cos.cas.osf.hibernate.dialect.OsfPostgresDialect}
147+
cas.authn.osf-postgres.jpa.autocommit=${OSF_DB_AUTOCOMMIT:false}
148+
cas.authn.osf-postgres.jpa.ddl-auto=${OSF_DB_DDLAUTO:validate}
147149
########################################################################################################################
148150

149151
########################################################################################################################
@@ -161,7 +163,7 @@ cas.jdbc.case-insensitive=false
161163
cas.ticket.registry.jpa.user=${CAS_DB_USER:postgres}
162164
cas.ticket.registry.jpa.password=${CAS_DB_PASSWORD:}
163165
cas.ticket.registry.jpa.driver-class=${CAS_DB_DRIVER_CLASS:org.postgresql.Driver}
164-
cas.ticket.registry.jpa.url=${CAS_DB_URL:jdbc:postgresql://127.0.0.1:5432/osf-cas?targetServerType=master}
166+
cas.ticket.registry.jpa.url=${CAS_DB_URL:jdbc:postgresql://127.0.0.1:5432/osf-cas?targetServerType=primary}
165167
cas.ticket.registry.jpa.dialect=${CAS_DB_HIBERNATE_DIALECT:org.hibernate.dialect.PostgreSQL95Dialect}
166168
cas.ticket.registry.jpa.ddl-auto=update
167169
cas.ticket.registry.jpa.default-catalog=

etc/cas/config/local/cas-local.properties

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ cas.authn.osf-postgres.order=0
148148
cas.authn.osf-postgres.jpa.user=postgres
149149
cas.authn.osf-postgres.jpa.password=
150150
cas.authn.osf-postgres.jpa.driver-class=org.postgresql.Driver
151-
cas.authn.osf-postgres.jpa.url=jdbc:postgresql://192.168.168.167:5432/osf?targetServerType=master&readOnly=true
151+
cas.authn.osf-postgres.jpa.url=jdbc:postgresql://192.168.168.167:5432/osf?targetServerType=preferSecondary&readOnly=true&readOnlyMode=always
152152
cas.authn.osf-postgres.jpa.dialect=io.cos.cas.osf.hibernate.dialect.OsfPostgresDialect
153+
cas.authn.osf-postgres.jpa.autocommit=false
154+
cas.authn.osf-postgres.jpa.ddl-auto=validate
153155
########################################################################################################################
154156

155157
########################################################################################################################
@@ -166,10 +168,10 @@ cas.jdbc.case-insensitive=false
166168
#
167169
# General JPA Settings
168170
#
169-
cas.ticket.registry.jpa.user=longzechen
171+
cas.ticket.registry.jpa.user=postgres
170172
cas.ticket.registry.jpa.password=
171173
cas.ticket.registry.jpa.driver-class=org.postgresql.Driver
172-
cas.ticket.registry.jpa.url=jdbc:postgresql://192.168.168.167:54321/newcas?targetServerType=master
174+
cas.ticket.registry.jpa.url=jdbc:postgresql://192.168.168.167:2345/cas?targetServerType=primary
173175
cas.ticket.registry.jpa.dialect=org.hibernate.dialect.PostgreSQL95Dialect
174176
cas.ticket.registry.jpa.ddl-auto=update
175177
cas.ticket.registry.jpa.default-catalog=

0 commit comments

Comments
 (0)