Commit 11cedacd2af497b0653747b61b1a019e6ef18cd3
1 parent
ebbec801
Moved hsql DB folder to env variables
Showing
7 changed files
with
27 additions
and
10 deletions
... | ... | @@ -223,21 +223,36 @@ spring.mvc.cors: |
223 | 223 | allowed-headers: "*" |
224 | 224 | max-age: "1800" |
225 | 225 | allow-credentials: "true" |
226 | - | |
227 | -# SQL DAO Configuration | |
228 | 226 | |
227 | +# HSQLDB DAO Configuration | |
229 | 228 | spring: |
230 | 229 | data: |
231 | 230 | jpa: |
232 | 231 | repositories: |
233 | 232 | enabled: "true" |
234 | 233 | jpa: |
235 | - show-sql: "false" | |
236 | - database-platform: "org.hibernate.dialect.PostgreSQLDialect" | |
237 | 234 | hibernate: |
238 | 235 | ddl-auto: "validate" |
236 | + database-platform: "org.hibernate.dialect.HSQLDialect" | |
239 | 237 | datasource: |
240 | - driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" | |
241 | - url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" | |
242 | - username: "${SPRING_DATASOURCE_USERNAME:postgres}" | |
243 | - password: "${SPRING_DATASOURCE_PASSWORD:postgres}" | |
\ No newline at end of file | ||
238 | + driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.hsqldb.jdbc.JDBCDriver}" | |
239 | + url: "${SPRING_DATASOURCE_URL:jdbc:hsqldb:file:${SQL_DATA_FOLDER:/tmp}/thingsboardDb;sql.enforce_size=false}" | |
240 | + username: "${SPRING_DATASOURCE_USERNAME:sa}" | |
241 | + password: "${SPRING_DATASOURCE_PASSWORD:}" | |
242 | + | |
243 | + | |
244 | +# Postgres DAO Configuration | |
245 | +#spring: | |
246 | +# data: | |
247 | +# jpa: | |
248 | +# repositories: | |
249 | +# enabled: "true" | |
250 | +# jpa: | |
251 | +# hibernate: | |
252 | +# ddl-auto: "validate" | |
253 | +# database-platform: "org.hibernate.dialect.PostgreSQLDialect" | |
254 | +# datasource: | |
255 | +# driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" | |
256 | +# url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" | |
257 | +# username: "${SPRING_DATASOURCE_USERNAME:postgres}" | |
258 | +# password: "${SPRING_DATASOURCE_PASSWORD:postgres}" | ... | ... |
... | ... | @@ -6,6 +6,7 @@ |
6 | 6 | <logpath>${pkg.winWrapperLogFolder}</logpath> |
7 | 7 | <logmode>rotate</logmode> |
8 | 8 | <env name="LOADER_PATH" value="%BASE%\conf,%BASE%\extensions" /> |
9 | + <env name="SQL_DATA_FOLDER" value="%BASE%\data\sql" /> | |
9 | 10 | <executable>java</executable> |
10 | 11 | <startargument>-Dplatform=windows</startargument> |
11 | 12 | <startargument>-jar</startargument> | ... | ... |