misc: remove automatic tenant creation (#47823)
This commit is contained in:
parent
760962edc1
commit
29a067e12d
|
@ -1,9 +1,6 @@
|
||||||
[main]
|
[main]
|
||||||
app_dir = /var/lib/wcs
|
app_dir = /var/lib/wcs
|
||||||
data_dir = /usr/share/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
|
use_long_traces = true
|
||||||
#error_log = /var/lib/wcs/error.log
|
#error_log = /var/lib/wcs/error.log
|
||||||
# Redirect on unknown virtual host
|
# Redirect on unknown virtual host
|
||||||
|
|
|
@ -17,6 +17,5 @@
|
||||||
APP_DIR = "/var/lib/wcs"
|
APP_DIR = "/var/lib/wcs"
|
||||||
DATA_DIR = "/usr/share/wcs"
|
DATA_DIR = "/usr/share/wcs"
|
||||||
ERROR_LOG = None
|
ERROR_LOG = None
|
||||||
AUTO_CREATE_VHOSTS = False
|
|
||||||
REDIRECT_ON_UNKNOWN_VHOST = None
|
REDIRECT_ON_UNKNOWN_VHOST = None
|
||||||
USE_LONG_TRACES = True
|
USE_LONG_TRACES = True
|
||||||
|
|
|
@ -79,7 +79,6 @@ class WcsPublisher(StubWcsPublisher):
|
||||||
DATA_DIR = DATA_DIR
|
DATA_DIR = DATA_DIR
|
||||||
ERROR_LOG = ERROR_LOG
|
ERROR_LOG = ERROR_LOG
|
||||||
USE_LONG_TRACES = USE_LONG_TRACES
|
USE_LONG_TRACES = USE_LONG_TRACES
|
||||||
auto_create_appdir = AUTO_CREATE_VHOSTS
|
|
||||||
missing_appdir_redirect = REDIRECT_ON_UNKNOWN_VHOST
|
missing_appdir_redirect = REDIRECT_ON_UNKNOWN_VHOST
|
||||||
|
|
||||||
supported_languages = ['fr', 'es', 'de']
|
supported_languages = ['fr', 'es', 'de']
|
||||||
|
@ -117,9 +116,6 @@ class WcsPublisher(StubWcsPublisher):
|
||||||
if config.has_option("main", "use_long_traces"):
|
if config.has_option("main", "use_long_traces"):
|
||||||
cls.USE_LONG_TRACES = config.getboolean("main",
|
cls.USE_LONG_TRACES = config.getboolean("main",
|
||||||
"use_long_traces")
|
"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"):
|
if config.has_option("main", "missing_appdir_redirect"):
|
||||||
cls.missing_appdir_redirect = config.get("main",
|
cls.missing_appdir_redirect = config.get("main",
|
||||||
"missing_appdir_redirect")
|
"missing_appdir_redirect")
|
||||||
|
|
|
@ -92,7 +92,6 @@ class QommonPublisher(Publisher, object):
|
||||||
|
|
||||||
site_options = None
|
site_options = None
|
||||||
site_charset = 'utf-8'
|
site_charset = 'utf-8'
|
||||||
auto_create_appdir = True
|
|
||||||
missing_appdir_redirect = None
|
missing_appdir_redirect = None
|
||||||
use_sms_feature = True
|
use_sms_feature = True
|
||||||
|
|
||||||
|
@ -458,15 +457,10 @@ class QommonPublisher(Publisher, object):
|
||||||
self.app_dir += '+' + script_name
|
self.app_dir += '+' + script_name
|
||||||
|
|
||||||
if not os.path.exists(self.app_dir):
|
if not os.path.exists(self.app_dir):
|
||||||
if not self.auto_create_appdir:
|
if self.missing_appdir_redirect:
|
||||||
if self.missing_appdir_redirect:
|
raise ImmediateRedirectException(self.missing_appdir_redirect)
|
||||||
raise ImmediateRedirectException(self.missing_appdir_redirect)
|
else:
|
||||||
else:
|
raise Http404()
|
||||||
raise Http404()
|
|
||||||
try:
|
|
||||||
os.makedirs(self.app_dir)
|
|
||||||
except OSError as e:
|
|
||||||
pass
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
os.mkdir(self.form_tokens_dir)
|
os.mkdir(self.form_tokens_dir)
|
||||||
|
|
Loading…
Reference in New Issue