appletalk/gitea
0
0
Fork 0
forked from coop-cloud/gitea
Code Issues Pull Requests Projects Releases Wiki Activity

Final hold out on passwd -> password migration

Browse Source 
See https://git.autonomic.zone/coop-cloud/gitea/issues/10.
This commit is contained in:
decentral1se
2021-04-07 13:47:32 +02:00
parent 0f558acef9
commit a099e702fa
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compose.smtp.yml
View File

@ -6,10 +6,8 @@ services:
- GITEA_MAILER_HOST - GITEA_MAILER_HOST
- GITEA_MAILER_USER - GITEA_MAILER_USER
secrets: secrets:
- smtp_passwd - smtp_password
# Note(decentral1se): migrate from passwd -> password
# See https://git.autonomic.zone/coop-cloud/abra/pulls/33
secrets: secrets:
smtp_passwd: smtp_passord:
name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
external: true external: true

20
compose.yml
View File

@ -6,7 +6,7 @@ services:
- source: app_ini - source: app_ini
target: /data/gitea/conf/app.ini target: /data/gitea/conf/app.ini
secrets: secrets:
- db_passwd - db_password
- internal_token - internal_token
- jwt_secret - jwt_secret
- secret_key - secret_key
@ -58,11 +58,11 @@ services:
environment: environment:
- MYSQL_DATABASE=gitea - MYSQL_DATABASE=gitea
- MYSQL_USER=gitea - MYSQL_USER=gitea
- MYSQL_PASSWORD_FILE=/run/secrets/db_passwd - MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
secrets: secrets:
- db_passwd - db_password
- db_root_passwd - db_root_password
volumes: volumes:
- "mariadb:/var/lib/mysql" - "mariadb:/var/lib/mysql"
networks: networks:
@ -78,14 +78,12 @@ configs:
name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} name: ${STACK_NAME}_app_ini_${APP_INI_VERSION}
file: app.ini.tmpl file: app.ini.tmpl
template_driver: golang template_driver: golang
# Note(decentral1se): migrate from passwd -> password
# See https://git.autonomic.zone/coop-cloud/abra/pulls/33
secrets: secrets:
db_passwd: db_password:
name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
external: true external: true
db_root_passwd: db_root_password:
name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION} name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
external: true external: true
internal_token: internal_token:
name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION}