server/gitea: Used derivation of pass/name by database role

wip
Felix Stupp 5 years ago
parent c9206ff499
commit 3327a9e4b4
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -13,9 +13,9 @@ gitea_binary_path: "{{ gitea_installation_directory }}/gitea"
gitea_socket_path: "{{ gitea_user_directory }}/gitea.socket"
gitea_configuration_path: "{{ gitea_custom_directory }}/app.ini"
gitea_database_user: "gitea"
gitea_database_pass: "{{ lookup('password', 'credentials/' + inventory_hostname + '/mysql/' + gitea_database_user + ' length=80') }}"
gitea_database_name: "{{ gitea_database_user }}"
database_user: "gitea"
# database_pass from mysql/database
# database_name from mysql/database
gitea_internal_token: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/internal_token length=80') }}"
gitea_cookie_secret: "{{ lookup('password', 'credentials/' + inventory_hostname + '/gitea/' + domain + '/secret_key length=80') }}"

@ -2,8 +2,6 @@
dependencies:
- role: mysql/database
database_user: "{{ gitea_database_user }}"
database_pass: "{{ gitea_database_pass }}"
database_name: "{{ gitea_database_name }}"
# database_user
- role: nginx/proxy
backend_socket: "{{ gitea_socket_path }}"

@ -223,10 +223,10 @@ DSA = -1
; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
DB_TYPE = mysql
HOST = 127.0.0.1:3306
NAME = {{ gitea_database_name }}
USER = {{ gitea_database_user }}
NAME = {{ database_name }}
USER = {{ database_user }}
; Use PASSWD = `your password` for quoting if you use special characters in the password.
PASSWD = `{{ gitea_database_pass }}`
PASSWD = `{{ database_pass }}`
; For Postgres, either "disable" (default), "require", or "verify-full"
; For MySQL, either "false" (default), "true", or "skip-verify"
SSL_MODE = disable

Loading…
Cancel
Save