Skip to content

Commit 1cf5b84

Browse files
author
Martin
committed
Implement DB parameters on configure
1 parent 05c5863 commit 1cf5b84

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

imageroot/actions/configure-module/10configure_environment_vars

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,24 @@ else:
9393
# ------------------------------------------------
9494
# 6. Build final env file
9595
# ------------------------------------------------
96+
db_env = agent.read_envfile("app-db.env")
97+
9698
app_env = {
9799
# Admin
98100
"SEMAPHORE_ADMIN_PASSWORD": SEMAPHORE_ADMIN_PASSWORD,
99101
"SEMAPHORE_ADMIN_NAME": SEMAPHORE_ADMIN_NAME,
100102
"SEMAPHORE_ADMIN_EMAIL": SEMAPHORE_ADMIN_EMAIL,
101103
"SEMAPHORE_ADMIN": SEMAPHORE_ADMIN,
102104

105+
# Database (MariaDB)
106+
"SEMAPHORE_DB_DIALECT": db_env["SEMAPHORE_DB_DIALECT"],
107+
"SEMAPHORE_DB_HOST": db_env["SEMAPHORE_DB_HOST"],
108+
"SEMAPHORE_DB_PORT": db_env["SEMAPHORE_DB_PORT"],
109+
"SEMAPHORE_DB": db_env["SEMAPHORE_DB"],
110+
"SEMAPHORE_DB_USER": db_env["SEMAPHORE_DB_USER"],
111+
"SEMAPHORE_DB_PASS": db_env["SEMAPHORE_DB_PASS"],
112+
"SEMAPHORE_ACCESS_KEY_ENCRYPTION": db_env["SEMAPHORE_ACCESS_KEY_ENCRYPTION"],
113+
103114
# SMTP
104115
"SEMAPHORE_EMAIL_SENDER": MAIL_FROM_NAME,
105116
"SEMAPHORE_EMAIL_HOST": smtp["host"],
@@ -121,7 +132,7 @@ app_env = {
121132
"SEMAPHORE_LDAP_BIND_PASSWORD": os.getenv("LDAP_SEARCH_BIND_PASSWORD", ""),
122133
"SEMAPHORE_LDAP_SERVER": os.getenv("SEMAPHORE_LDAP_SERVER", ""),
123134
"SEMAPHORE_LDAP_SEARCH_DN": os.getenv("SEMAPHORE_LDAP_SEARCH_DN", ""),
124-
"SEMAPHORE_LDAP_SEARCH_FILTER": os.getenv("LDAP_USER_SEARCH_FILTER", ""),
135+
"SEMAPHORE_LDAP_SEARCH_FILTER": os.getenv("SEMAPHORE_LDAP_SEARCH_FILTER", ""),
125136
"SEMAPHORE_LDAP_NEEDTLS": "False",
126137
"SEMAPHORE_LDAP_MAPPING_DN": "dn",
127138
"SEMAPHORE_LDAP_MAPPING_MAIL": "mail",

0 commit comments

Comments
 (0)