зеркало из https://github.com/mozilla/treeherder.git
Bug 1125530 - Remove the TREEHERDER_DATABASE_PORT pref
We only pass it in some cases, so setting it to anything other than the default will break all the places where we don't use it. Django doesn't require it is set, since it will fall back to the default port for that engine type anyway.
This commit is contained in:
Родитель
4e4ef16df5
Коммит
fc88dcf73d
|
@ -38,7 +38,6 @@ manifest like this inside the puppet directory:
|
|||
export TREEHERDER_DATABASE_USER='${DB_USER}'
|
||||
export TREEHERDER_DATABASE_PASSWORD='${DB_PASS}'
|
||||
export TREEHERDER_DATABASE_HOST='${DB_HOST}'
|
||||
export TREEHERDER_DATABASE_PORT='${DB_PORT}'
|
||||
export TREEHERDER_DEBUG='1'
|
||||
export TREEHERDER_DJANGO_SECRET_KEY='${DJANGO_SECRET_KEY}'
|
||||
export TREEHERDER_MEMCACHED='127.0.0.1:11211'
|
||||
|
|
|
@ -43,7 +43,6 @@ export TREEHERDER_DATABASE_NAME='${DB_NAME}'
|
|||
export TREEHERDER_DATABASE_USER='${DB_USER}'
|
||||
export TREEHERDER_DATABASE_PASSWORD='${DB_PASS}'
|
||||
export TREEHERDER_DATABASE_HOST='${DB_HOST}'
|
||||
export TREEHERDER_DATABASE_PORT='${DB_PORT}'
|
||||
export TREEHERDER_DEBUG='1'
|
||||
export TREEHERDER_DJANGO_SECRET_KEY='${DJANGO_SECRET_KEY}'
|
||||
export TREEHERDER_MEMCACHED='127.0.0.1:11211'
|
||||
|
|
|
@ -42,7 +42,6 @@ export TREEHERDER_DATABASE_NAME='${DB_NAME}'
|
|||
export TREEHERDER_DATABASE_USER='${DB_USER}'
|
||||
export TREEHERDER_DATABASE_PASSWORD='${DB_PASS}'
|
||||
export TREEHERDER_DATABASE_HOST='${DB_HOST}'
|
||||
export TREEHERDER_DATABASE_PORT='${DB_PORT}'
|
||||
export TREEHERDER_DEBUG='1'
|
||||
export TREEHERDER_DJANGO_SECRET_KEY='${DJANGO_SECRET_KEY}'
|
||||
export TREEHERDER_MEMCACHED='127.0.0.1:11211'
|
||||
|
|
|
@ -19,7 +19,6 @@ TREEHERDER_DATABASE_NAME = os.environ.get("TREEHERDER_DATABASE_NAME", "")
|
|||
TREEHERDER_DATABASE_USER = os.environ.get("TREEHERDER_DATABASE_USER", "")
|
||||
TREEHERDER_DATABASE_PASSWORD = os.environ.get("TREEHERDER_DATABASE_PASSWORD", "")
|
||||
TREEHERDER_DATABASE_HOST = os.environ.get("TREEHERDER_DATABASE_HOST", "localhost")
|
||||
TREEHERDER_DATABASE_PORT = os.environ.get("TREEHERDER_DATABASE_PORT", "")
|
||||
|
||||
TREEHERDER_RO_DATABASE_USER = os.environ.get("TREEHERDER_RO_DATABASE_USER", TREEHERDER_DATABASE_USER)
|
||||
TREEHERDER_RO_DATABASE_PASSWORD = os.environ.get("TREEHERDER_RO_DATABASE_PASSWORD", TREEHERDER_DATABASE_PASSWORD)
|
||||
|
@ -358,7 +357,6 @@ DATABASES = {
|
|||
"USER": TREEHERDER_DATABASE_USER,
|
||||
"PASSWORD": TREEHERDER_DATABASE_PASSWORD,
|
||||
"HOST": TREEHERDER_DATABASE_HOST,
|
||||
"PORT": TREEHERDER_DATABASE_PORT,
|
||||
},
|
||||
"read_only": {
|
||||
"ENGINE": "django.db.backends.mysql",
|
||||
|
@ -366,7 +364,6 @@ DATABASES = {
|
|||
"USER": TREEHERDER_RO_DATABASE_USER,
|
||||
"PASSWORD": TREEHERDER_RO_DATABASE_PASSWORD,
|
||||
"HOST": TREEHERDER_RO_DATABASE_HOST,
|
||||
"PORT": TREEHERDER_DATABASE_PORT,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ TREEHERDER_DATABASE_NAME = os.environ.get("TREEHERDER_DATABASE_NAME", "")
|
|||
TREEHERDER_DATABASE_USER = os.environ.get("TREEHERDER_DATABASE_USER", "")
|
||||
TREEHERDER_DATABASE_PASSWORD = os.environ.get("TREEHERDER_DATABASE_PASSWORD", "")
|
||||
TREEHERDER_DATABASE_HOST = os.environ.get("TREEHERDER_DATABASE_HOST", "localhost")
|
||||
TREEHERDER_DATABASE_PORT = os.environ.get("TREEHERDER_DATABASE_PORT", "")
|
||||
|
||||
TREEHERDER_RO_DATABASE_USER = os.environ.get("TREEHERDER_RO_DATABASE_USER", TREEHERDER_DATABASE_USER)
|
||||
TREEHERDER_RO_DATABASE_PASSWORD = os.environ.get("TREEHERDER_RO_DATABASE_PASSWORD", TREEHERDER_DATABASE_PASSWORD)
|
||||
|
|
Загрузка…
Ссылка в новой задаче