diff --git a/files/hosts/ask01.stg.phx2.fedoraproject.org-hosts b/files/hosts/ask01.stg.phx2.fedoraproject.org-hosts new file mode 100644 index 0000000000..976ef96a0f --- /dev/null +++ b/files/hosts/ask01.stg.phx2.fedoraproject.org-hosts @@ -0,0 +1,11 @@ +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +10.5.126.89 admin.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org +10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all +10.5.126.23 infrastructure.fedoraproject.org + +10.5.126.81 memcached03 memcached03.stg app01 app01.stg + +10.5.126.85 db-ask diff --git a/roles/ask/templates/settings.py b/roles/ask/templates/settings.py index 5ea17e5d0c..90b2df4780 100644 --- a/roles/ask/templates/settings.py +++ b/roles/ask/templates/settings.py @@ -26,12 +26,7 @@ DATABASES = { 'NAME': 'askfedora', 'USER': 'askfedora', # Not used with sqlite3. 'PASSWORD': '{{ askbotDBPassword }}', # Not used with sqlite3. - {% if env == "staging" %} - 'HOST' : 'db02.stg', - {% else %} - 'HOST' : 'db-ask', - {% endif %} - # Set to empty string for localhost. Not used with sqlite3. + 'HOST' : 'db-ask', # Set to empty string for localhost. Not used with sqlite3. 'PORT': '5432', # Set to empty string for default. Not used with sqlite3. 'TEST_CHARSET': 'utf8', # Setting the character set and collation to utf-8 'TEST_COLLATION': 'utf8_general_ci', # is necessary for MySQL tests to work properly. @@ -249,7 +244,7 @@ CELERY_ALWAYS_EAGER = True -{% if environment == "staging" %} +{% if env == "staging" %} DOMAIN_NAME = 'ask.stg.fedoraproject.org' {% else %} DOMAIN_NAME = 'ask.fedoraproject.org'