From 54dd9d48eb6ae6f7f04f5f5130f24f5307562e52 Mon Sep 17 00:00:00 2001 From: Belmiro Moreira Date: Sun, 10 Mar 2013 20:07:53 +0100 Subject: [PATCH 1/4] add STACKTACH_DB_PORT variable --- etc/sample_stacktach_config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/sample_stacktach_config.sh b/etc/sample_stacktach_config.sh index 72f5c1e..d59a602 100644 --- a/etc/sample_stacktach_config.sh +++ b/etc/sample_stacktach_config.sh @@ -2,6 +2,7 @@ export STACKTACH_DB_NAME="stacktach" export STACKTACH_DB_HOST="" export STACKTACH_DB_USERNAME="root" export STACKTACH_DB_PASSWORD="password" +export STACKTACH_DB_PORT="3306" export STACKTACH_INSTALL_DIR="/srv/www/stacktach/" export STACKTACH_DEPLOYMENTS_FILE="/srv/www/stacktach/stacktach_worker_config.json" From 3c6cc39123892f57d120e09c326db667f0fcee63 Mon Sep 17 00:00:00 2001 From: Belmiro Moreira Date: Sun, 10 Mar 2013 20:10:50 +0100 Subject: [PATCH 2/4] use STACKTACH_DB_PORT --- settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.py b/settings.py index fec44ea..42d705f 100644 --- a/settings.py +++ b/settings.py @@ -9,6 +9,7 @@ try: db_host = STACKTACH_DB_HOST db_username = STACKTACH_DB_USERNAME db_password = STACKTACH_DB_PASSWORD + db_port = STACKTACH_DB_PORT install_dir = STACKTACH_INSTALL_DIR except ImportError: db_engine = os.environ.get('STACKTACH_DB_ENGINE', @@ -17,6 +18,7 @@ except ImportError: db_host = os.environ.get('STACKTACH_DB_HOST', "") db_username = os.environ['STACKTACH_DB_USERNAME'] db_password = os.environ['STACKTACH_DB_PASSWORD'] + db_port = os.environ['STACKTACH_DB_PORT'] install_dir = os.environ['STACKTACH_INSTALL_DIR'] DEBUG = False @@ -35,7 +37,7 @@ DATABASES = { 'USER': db_username, 'PASSWORD': db_password, 'HOST': db_host, # Set to empty string for localhost. - 'PORT': '', # Set to empty string for default. + 'PORT': db_port, # Set to empty string for default. } } From a5b6ef2409ebb35919f64e70e6a9cbd342950c0a Mon Sep 17 00:00:00 2001 From: Belmiro Moreira Date: Tue, 12 Mar 2013 16:24:53 +0100 Subject: [PATCH 3/4] Update settings.py --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.py b/settings.py index 42d705f..bb05a8d 100644 --- a/settings.py +++ b/settings.py @@ -18,7 +18,7 @@ except ImportError: db_host = os.environ.get('STACKTACH_DB_HOST', "") db_username = os.environ['STACKTACH_DB_USERNAME'] db_password = os.environ['STACKTACH_DB_PASSWORD'] - db_port = os.environ['STACKTACH_DB_PORT'] + db_port = os.environ['STACKTACH_DB_PORT', ""] install_dir = os.environ['STACKTACH_INSTALL_DIR'] DEBUG = False From 9ecbba5ccbff5636aa0c7b775fe479ddcccfeb04 Mon Sep 17 00:00:00 2001 From: Belmiro Moreira Date: Tue, 12 Mar 2013 16:53:56 +0100 Subject: [PATCH 4/4] Update settings.py --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.py b/settings.py index bb05a8d..7d0e86a 100644 --- a/settings.py +++ b/settings.py @@ -18,7 +18,7 @@ except ImportError: db_host = os.environ.get('STACKTACH_DB_HOST', "") db_username = os.environ['STACKTACH_DB_USERNAME'] db_password = os.environ['STACKTACH_DB_PASSWORD'] - db_port = os.environ['STACKTACH_DB_PORT', ""] + db_port = os.environ.get('STACKTACH_DB_PORT', "") install_dir = os.environ['STACKTACH_INSTALL_DIR'] DEBUG = False