Skip to content

Commit 1b031eb

Browse files
committed
Merge db settings in settings/docker.py
* We don't benefit from having separate definitions * Pycharm was marking this code block with "replace dictionary creation" recommendation
1 parent 14bd859 commit 1b031eb

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

djangoproject/settings/docker.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
"PASSWORD": os.environ.get("SQL_PASSWORD"),
99
"HOST": os.environ.get("SQL_HOST"),
1010
"PORT": os.environ.get("SQL_PORT"),
11-
}
11+
},
12+
"trac": {
13+
"ENGINE": "django.db.backends.postgresql",
14+
"NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
15+
"USER": os.environ.get("TRAC_USER", "code.djangoproject"),
16+
"PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
17+
"HOST": os.environ.get("TRAC_HOST", "db"),
18+
"PORT": os.environ.get("TRAC_PORT", "5432"),
19+
},
1220
}
1321

14-
# Trac connection
15-
DATABASES["trac"] = {
16-
"ENGINE": "django.db.backends.postgresql",
17-
"NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
18-
"USER": os.environ.get("TRAC_USER", "code.djangoproject"),
19-
"PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
20-
"HOST": os.environ.get("TRAC_HOST", "db"),
21-
"PORT": os.environ.get("TRAC_PORT", "5432"),
22-
}
2322

2423
SECRET_KEY = os.environ.get("SECRET_KEY")
2524

0 commit comments

Comments
 (0)