project : vault as private submodule

ecsimsw · Nov 25, 2023 · 9a866ac · 9a866ac
1 parent 05f9aec
commit 9a866ac
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 275 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "infra/server-kubernetes/picup/config/vault"]
 	path = infra/server-kubernetes/picup/config/vault
 	url = https://github.com/ecsimsw/pic-up-vault.git
+[submodule "infra-kubernetes/picup/config/pic-up-vault"]
+	path = infra-kubernetes/picup/config/pic-up-vault
+	url = https://github.com/ecsimsw/pic-up-vault.git
diff --git a/infra-kubernetes/picup/config/common.config.yaml b/infra-kubernetes/picup/config/common.config.yaml
@@ -5,8 +5,9 @@ metadata:
   namespace: picup
 data:
   SPRING_PROFILES_ACTIVE: "prod"
-  TOKEN_SECRET: "ecsimswtemptokensecretqwertyqwerty123123123"
-  DATA_AES_ENCRYPTION_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+  TOKEN_SECRET: "ecsimswtemptokensecretqyqwerty123123123"
+  DATA_AES_ENCRYPTION_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaabbb"
+  DATA_AES_ENCRYPTION_IV: "0123456789012345"
   PICUP_MESSAGE_QUEUE_HOST: "cloud.ecsimsw.com"
   PICUP_MESSAGE_QUEUE_PORT: "5672"
   PICUP_MESSAGE_QUEUE_USERNAME: "admin"

diff --git a/infra-kubernetes/picup/config/pic-up-vault b/infra-kubernetes/picup/config/pic-up-vault
diff --git a/infra-kubernetes/picup/config/vault/config/README.md b/infra-kubernetes/picup/config/vault/config/README.md
diff --git a/infra-kubernetes/picup/config/vault/config/album-config.yaml b/infra-kubernetes/picup/config/vault/config/album-config.yaml
diff --git a/infra-kubernetes/picup/config/vault/config/common.config.yaml b/infra-kubernetes/picup/config/vault/config/common.config.yaml
diff --git a/infra-kubernetes/picup/config/vault/config/member-config.yaml b/infra-kubernetes/picup/config/vault/config/member-config.yaml
diff --git a/infra-kubernetes/picup/config/vault/config/storage-config.yaml b/infra-kubernetes/picup/config/vault/config/storage-config.yaml
diff --git a/infra-kubernetes/picup/config/vault/db/1.mysql-replication.sql b/infra-kubernetes/picup/config/vault/db/1.mysql-replication.sql
diff --git a/infra-kubernetes/picup/config/vault/db/2.mysql-multi-source-replication.sql b/infra-kubernetes/picup/config/vault/db/2.mysql-multi-source-replication.sql
diff --git a/infra-kubernetes/picup/config/vault/db/3.application-user.sql b/infra-kubernetes/picup/config/vault/db/3.application-user.sql
diff --git a/infra-kubernetes/picup/config/vault/docker-compose/docker-compose-cloud.yaml b/infra-kubernetes/picup/config/vault/docker-compose/docker-compose-cloud.yaml
diff --git a/infra-kubernetes/picup/config/vault/docker-compose/mysql-album-master/mysql-1.cnf b/infra-kubernetes/picup/config/vault/docker-compose/mysql-album-master/mysql-1.cnf
diff --git a/infra-kubernetes/picup/config/vault/docker-compose/mysql-album-slave/mysql-2.cnf b/infra-kubernetes/picup/config/vault/docker-compose/mysql-album-slave/mysql-2.cnf
diff --git a/infra-kubernetes/picup/config/vault/docker-compose/mysql-common-backup/mysql-4.cnf b/infra-kubernetes/picup/config/vault/docker-compose/mysql-common-backup/mysql-4.cnf
diff --git a/infra-kubernetes/picup/config/vault/docker-compose/mysql-member/mysql-3.cnf b/infra-kubernetes/picup/config/vault/docker-compose/mysql-member/mysql-3.cnf
diff --git a/server-api/api-album/src/main/resources/properties/prod/secure.properties b/server-api/api-album/src/main/resources/properties/prod/secure.properties
@@ -7,4 +7,4 @@ ecsimsw.token.secret.key=${TOKEN_SECRET}
 
 # encrypt
 data.aes.encryption.key=${DATA_AES_ENCRYPTION_KEY}
-data.aes.encryption.iv=0123456789012345
+data.aes.encryption.iv=${DATA_AES_ENCRYPTION_IV}
diff --git a/server-api/api-member/src/main/resources/properties/prod/secure.properties b/server-api/api-member/src/main/resources/properties/prod/secure.properties
@@ -7,4 +7,4 @@ ecsimsw.token.secret.key=${TOKEN_SECRET}
 
 # encrypt
 data.aes.encryption.key=${DATA_AES_ENCRYPTION_KEY}
-data.aes.encryption.iv=0123456789012345
+data.aes.encryption.iv=${DATA_AES_ENCRYPTION_IV}
diff --git a/server-api/api-storage/src/main/resources/properties/prod/secure.properties b/server-api/api-storage/src/main/resources/properties/prod/secure.properties
@@ -7,4 +7,4 @@ ecsimsw.token.secret.key=${TOKEN_SECRET}
 
 # encrypt
 data.aes.encryption.key=${DATA_AES_ENCRYPTION_KEY}
-data.aes.encryption.iv=0123456789012345
+data.aes.encryption.iv=${DATA_AES_ENCRYPTION_IV}