diff --git a/wcs.cfg-sample b/wcs.cfg-sample index 484648282..010a80fb8 100644 --- a/wcs.cfg-sample +++ b/wcs.cfg-sample @@ -1,9 +1,6 @@ [main] app_dir = /var/lib/wcs data_dir = /usr/share/wcs -# Set auto_create_appdir to true to automatically create virtual hosts on -# HTTP access. -# auto_create_appdir = false use_long_traces = true #error_log = /var/lib/wcs/error.log # Redirect on unknown virtual host diff --git a/wcs/Defaults.py b/wcs/Defaults.py index afa1377be..d880f80f6 100644 --- a/wcs/Defaults.py +++ b/wcs/Defaults.py @@ -17,6 +17,5 @@ APP_DIR = "/var/lib/wcs" DATA_DIR = "/usr/share/wcs" ERROR_LOG = None -AUTO_CREATE_VHOSTS = False REDIRECT_ON_UNKNOWN_VHOST = None USE_LONG_TRACES = True diff --git a/wcs/publisher.py b/wcs/publisher.py index 91b8383c3..e3e717d85 100644 --- a/wcs/publisher.py +++ b/wcs/publisher.py @@ -79,7 +79,6 @@ class WcsPublisher(StubWcsPublisher): DATA_DIR = DATA_DIR ERROR_LOG = ERROR_LOG USE_LONG_TRACES = USE_LONG_TRACES - auto_create_appdir = AUTO_CREATE_VHOSTS missing_appdir_redirect = REDIRECT_ON_UNKNOWN_VHOST supported_languages = ['fr', 'es', 'de'] @@ -117,9 +116,6 @@ class WcsPublisher(StubWcsPublisher): if config.has_option("main", "use_long_traces"): cls.USE_LONG_TRACES = config.getboolean("main", "use_long_traces") - if config.has_option("main", "auto_create_appdir"): - cls.auto_create_appdir = config.getboolean("main", - "auto_create_appdir") if config.has_option("main", "missing_appdir_redirect"): cls.missing_appdir_redirect = config.get("main", "missing_appdir_redirect") diff --git a/wcs/qommon/publisher.py b/wcs/qommon/publisher.py index 63ddda770..f7c9e122a 100644 --- a/wcs/qommon/publisher.py +++ b/wcs/qommon/publisher.py @@ -92,7 +92,6 @@ class QommonPublisher(Publisher, object): site_options = None site_charset = 'utf-8' - auto_create_appdir = True missing_appdir_redirect = None use_sms_feature = True @@ -458,15 +457,10 @@ class QommonPublisher(Publisher, object): self.app_dir += '+' + script_name if not os.path.exists(self.app_dir): - if not self.auto_create_appdir: - if self.missing_appdir_redirect: - raise ImmediateRedirectException(self.missing_appdir_redirect) - else: - raise Http404() - try: - os.makedirs(self.app_dir) - except OSError as e: - pass + if self.missing_appdir_redirect: + raise ImmediateRedirectException(self.missing_appdir_redirect) + else: + raise Http404() try: os.mkdir(self.form_tokens_dir)