From efda70bb7a938b59bdce2c30d39de7890490d3b4 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Mon, 18 Feb 2019 13:32:44 -0600
Subject: [PATCH] Clean up hostnames in settings files
---
config/settings/base.py | 4 ++++
config/settings/container/dev.py | 7 +++----
config/settings/vm/base.py | 2 +-
config/settings/vm/dev.py | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/config/settings/base.py b/config/settings/base.py
index 98bc076a6..00e5a7643 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -67,6 +67,10 @@ USE_TZ = True
# stopping requests submitted with a fake HTTP Host header.
ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+# Internal hostname and IP address
+INTERNAL_HOSTNAME = socket.gethostname()
+INTERNAL_IP_ADDRESS = socket.gethostbyname(INTERNAL_HOSTNAME)
+
# Sessions settings -----------------------------------------------------------
SESSION_COOKIE_AGE = 3600*23
SESSION_COOKIE_SECURE = True
diff --git a/config/settings/container/dev.py b/config/settings/container/dev.py
index f7c21b831..cf1447dfe 100644
--- a/config/settings/container/dev.py
+++ b/config/settings/container/dev.py
@@ -43,10 +43,9 @@ if 'silk' in INSTALLED_APPS:
# some headers which we want to keep hidden. So to be safe, we only allow
# it to be used through this server. You need to configure a SOCKS proxy
# on your local machine to use DJDT (see admin docs).
-# FIXME
-#INTERNAL_IPS = [
-# socket.gethostbyname(SERVER_HOSTNAME),
-#]
+INTERNAL_IPS = [
+ INTERNAL_IP_ADDRESS,
+]
# Adjust ADMINS for dev instances
ADMINS = [
diff --git a/config/settings/vm/base.py b/config/settings/vm/base.py
index 31078c7bf..febed8965 100644
--- a/config/settings/vm/base.py
+++ b/config/settings/vm/base.py
@@ -21,7 +21,7 @@ DATABASES = {
# Set up allowed hosts
SERVER_FQDN = socket.getfqdn()
-SERVER_HOSTNAME = socket.gethostname()
+SERVER_HOSTNAME = INTERNAL_HOSTNAME
ALLOWED_HOSTS += [SERVER_FQDN, '{hostname}.ligo.org'.format(
hostname=SERVER_HOSTNAME)]
diff --git a/config/settings/vm/dev.py b/config/settings/vm/dev.py
index 1724bd7cf..118235c53 100644
--- a/config/settings/vm/dev.py
+++ b/config/settings/vm/dev.py
@@ -46,7 +46,7 @@ if 'silk' in INSTALLED_APPS:
# it to be used through this server. You need to configure a SOCKS proxy
# on your local machine to use DJDT (see admin docs).
INTERNAL_IPS = [
- socket.gethostbyname(SERVER_HOSTNAME),
+ INTERNAL_IP_ADDRESS,
]
# Adjust ADMINS for dev instances
--
GitLab