From fc88dcf73d803bcf05cd78a8ab325083f181c56f Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Sat, 14 Feb 2015 21:38:26 +0000 Subject: [PATCH] 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. --- docs/deployment.rst | 1 - puppet/manifests/production.pp | 1 - puppet/manifests/vagrant.pp | 1 - treeherder/settings/base.py | 3 --- treeherder/settings/local.sample.py | 1 - 5 files changed, 7 deletions(-) diff --git a/docs/deployment.rst b/docs/deployment.rst index b224e9b62..07c6fd70a 100644 --- a/docs/deployment.rst +++ b/docs/deployment.rst @@ -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' diff --git a/puppet/manifests/production.pp b/puppet/manifests/production.pp index ff3ef24dc..746ea6821 100644 --- a/puppet/manifests/production.pp +++ b/puppet/manifests/production.pp @@ -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' diff --git a/puppet/manifests/vagrant.pp b/puppet/manifests/vagrant.pp index ac08099d7..ea61101a2 100644 --- a/puppet/manifests/vagrant.pp +++ b/puppet/manifests/vagrant.pp @@ -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' diff --git a/treeherder/settings/base.py b/treeherder/settings/base.py index 6c3ea4d16..be1418d6d 100644 --- a/treeherder/settings/base.py +++ b/treeherder/settings/base.py @@ -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, } } diff --git a/treeherder/settings/local.sample.py b/treeherder/settings/local.sample.py index 14dd6c96a..fe57f10ff 100644 --- a/treeherder/settings/local.sample.py +++ b/treeherder/settings/local.sample.py @@ -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)