From 99e0eb7a7af8b447a4c396b9227a63c6ea0e788a Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Sun, 18 Mar 2018 18:53:08 +0100 Subject: [PATCH] Require SERVER_NAME in the configuration Since we rely more and more on the presence of SERVER_NAME in the configuration, we make it a hard requirement, before checking if it is a FQDN. --- pillar/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pillar/__init__.py b/pillar/__init__.py index 7d385d8d..4cef6f7d 100644 --- a/pillar/__init__.py +++ b/pillar/__init__.py @@ -144,8 +144,11 @@ class PillarServer(BlinkerCompatibleEve): if not self.config.get('SECRET_KEY'): raise ConfigurationMissingError('SECRET_KEY configuration key is missing') - server_name = self.config.get('SERVER_NAME', '') - if server_name != 'localhost' and '.' not in server_name: + server_name = self.config.get('SERVER_NAME') + if not server_name: + raise ConfigurationMissingError('SERVER_NAME configuration key is missing, should be a ' + 'FQDN with TLD') + elif server_name != 'localhost' and '.' not in server_name: raise ConfigurationMissingError('SERVER_NAME should contain a FQDN with TLD') def _load_flask_config(self):