Skip to content

Commit 72d1cbc

Browse files
authored
Merge pull request #96 from devgateway/alive-dev
Alive dev
2 parents 3a2d71d + 5312754 commit 72d1cbc

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/deploy_api_jars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths:
66
- commons/**
77
branches:
8-
- main # or master or release branches
8+
- main
99
jobs:
1010
build-and-deploy:
1111
runs-on: ubuntu-latest

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ data
77
target
88
/commons/target/
99

10-
# Secrets and certificates
10+
1111
*.jks
1212
*.p12
1313
*.pem
1414
*.key
1515
*.cer
1616
*.pfx
1717

18-
# Secret purge script and artifacts
18+
1919
purge-secrets.sh
2020
replacements.txt
2121
.vscode

api-security/src/main/resources/application-dev.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
server.port=8763
22
spring.application.name=api-security
3-
# SECURITY: Development default only — set JWT_SECRET env var in production
3+
#SECURITY: Development default only — set JWT_SECRET env var in production
44
jwt.secret=${JWT_SECRET:dev-only-jwt-secret-do-not-use-in-production}
5-
#eureka.instance.preferIpAddress=true
5+
eureka.instance.preferIpAddress=true
66
eureka.client.registerWithEureka=true
77
eureka.client.fetchRegistry=true
88
eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://localhost:8761/eureka}
@@ -11,7 +11,7 @@ spring.servlet.multipart.max-file-size=100MB
1111
spring.servlet.multipart.max-request-size=100MB
1212

1313
spring.datasource.username=postgres
14-
# SECURITY: Development default only — override via SPRING_DATASOURCE_PASSWORD env var
14+
#SECURITY: Development default only — override via SPRING_DATASOURCE_PASSWORD env var
1515
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:admin}
1616
spring.datasource.url=jdbc:postgresql://localhost:5432/viz
1717

api-security/src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
server.port=8763
22
spring.application.name=api-security
3-
# SECURITY: Override jwt.secret with a strong random value via the JWT_SECRET environment variable in production
3+
#SECURITY: Override jwt.secret with a strong random value via the JWT_SECRET environment variable in production
44
jwt.secret=${JWT_SECRET:change-me-in-production-use-a-long-random-string}
55
spring.jpa.properties.hibernate.default_schema=public
66
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
77
spring.jpa.hibernate.ddl-auto=update
88
spring.datasource.url=jdbc:postgresql://postgres:5432/viz
99
spring.datasource.username=postgres
10-
# SECURITY: Default credentials for local development only — override via SPRING_DATASOURCE_PASSWORD env var in production
10+
#SECURITY: Default credentials for local development only — override via SPRING_DATASOURCE_PASSWORD env var in production
1111
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:admin}
1212
eureka.instance.preferIpAddress=true
1313
eureka.client.registerWithEureka=true

commons/src/main/resources/common.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# The SQL dialect makes Hibernate generate better SQL for the chosen database
1+
The SQL dialect makes Hibernate generate better SQL for the chosen database
22

33
spring.datasource.hikari.connection-timeout=50000
44
spring.datasource.hikari.idle-timeout=300000
@@ -8,12 +8,12 @@ spring.datasource.hikari.minimum-idle=5
88
spring.datasource.hikari.pool-name=ConnPool
99

1010
spring.jpa.properties.hibernate.dialect=org.devgateway.viz.commons.dialect.PostgreSQL10SchemaDialect
11-
# Hibernate ddl auto (create, create-drop, validate, update)
11+
#Hibernate ddl auto (create, create-drop, validate, update)
1212
spring.liquibase.enabled=false
1313
spring.liquibase.change-log=classpath:liquibase-changeLog.xml
1414
spring.datasource.url=jdbc:postgresql://postgres:5432/viz
1515
spring.datasource.username=postgres
16-
# SECURITY: Development default only — override via SPRING_DATASOURCE_PASSWORD env var in production
16+
#SECURITY: Development default only — override via SPRING_DATASOURCE_PASSWORD env var in production
1717
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:admin}
1818
spring.jpa.generate-ddl=true
1919
spring.jpa.hibernate.ddl-auto=update
@@ -28,12 +28,12 @@ viz.date.format='DD/MM/YYYY'
2828
management.port=8080
2929
management.ssl.enable=true
3030
management.ssl.key-store=classpath:management.jks
31-
# SECURITY: Override via MANAGEMENT_SSL_KEY_PASSWORD env var in production
31+
#SECURITY: Override via MANAGEMENT_SSL_KEY_PASSWORD env var in production
3232
management.ssl.key-password=${MANAGEMENT_SSL_KEY_PASSWORD:secret}
3333
management.endpoints.web.exposure.include=health,info
3434
management.endpoint.health.show-details=always
3535
spring.security.user.name=admin
36-
# SECURITY: Development default only — override via SPRING_SECURITY_USER_PASSWORD env var in production
36+
#SECURITY: Development default only — override via SPRING_SECURITY_USER_PASSWORD env var in production
3737
spring.security.user.password=${SPRING_SECURITY_USER_PASSWORD:admin}
3838
eureka.client.serviceUrl.defaultZone=http://eureka:8761/eureka/
3939
spring.servlet.multipart.max-file-size=100MB

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
image: postgres:16.8
44
environment:
55
POSTGRES_USER: postgres
6-
# REMOVED*** SECURITY: Override with a strong password in production via POSTGRES_PASSWORD env var
6+
#SECURITY: Override with a strong password in production via POSTGRES_PASSWORD env var
77
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-admin}
88
POSTGRES_DB: viz
99
ports:

superset-proxy/.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ target/
33
!**/src/main/**/target/
44
!**/src/test/**/target/
55

6-
### IntelliJ IDEA ###
6+
# IntelliJ IDEA
77
.idea/modules.xml
88
.idea/jarRepositories.xml
99
.idea/compiler.xml
@@ -12,7 +12,7 @@ target/
1212
*.iml
1313
*.ipr
1414

15-
### Eclipse ###
15+
# Eclipse
1616
.apt_generated
1717
.classpath
1818
.factorypath
@@ -21,7 +21,7 @@ target/
2121
.springBeans
2222
.sts4-cache
2323

24-
### NetBeans ###
24+
# NetBeans
2525
/nbproject/private/
2626
/nbbuild/
2727
/dist/
@@ -31,8 +31,8 @@ build/
3131
!**/src/main/**/build/
3232
!**/src/test/**/build/
3333

34-
### VS Code ###
34+
# VS Code
3535
.vscode/
3636

37-
### Mac OS ###
37+
# Mac OS
3838
.DS_Store

superset-proxy/src/main/java/org/devgateway/viz/gateway/common/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ public class Constants {
1212
public static final String DEFAULT_COLOR = "#555";
1313

1414
public static final List<String> COLORS = List.of(
15-
"#484848", "#BA4747", "#FACE58", "#EA901C", "#6EBB6D", "#4D8A24", "#2765A5", "#6E60B3", "#A64C8C", "#D8D8D8");
15+
"#484848", "#BA4747", "#FACE58", "#EA901C", "#6EBB6D", "#4D8A24", "#2765A5", "#6E60B3", "#A64C8C", "#D8D8D8");
1616
}

0 commit comments

Comments
 (0)