Projet

Général

Profil

0002-misc-remove-automatic-tenant-creation-47823.patch

Frédéric Péters, 18 octobre 2020 10:31

Télécharger (3,22 ko)

Voir les différences: 

Subject: [PATCH 2/2] misc: remove automatic tenant creation (#47823)


 wcs.cfg-sample          |  3 ---
 wcs/Defaults.py         |  1 -
 wcs/publisher.py        |  4 ----
 wcs/qommon/publisher.py | 14 ++++----------
 4 files changed, 4 insertions(+), 18 deletions(-)
wcs.cfg-sample
1 1 
[main]
2 2 
app_dir = /var/lib/wcs
3 3 
data_dir = /usr/share/wcs
4 
# Set auto_create_appdir to true to automatically create virtual hosts on
5 
# HTTP access.
6 
# auto_create_appdir = false
7 4 
use_long_traces = true
8 5 
#error_log = /var/lib/wcs/error.log
9 6 
# Redirect on unknown virtual host
wcs/Defaults.py
17 17 
APP_DIR = "/var/lib/wcs"
18 18 
DATA_DIR = "/usr/share/wcs"
19 19 
ERROR_LOG = None
20 
AUTO_CREATE_VHOSTS = False
21 20 
REDIRECT_ON_UNKNOWN_VHOST = None
22 21 
USE_LONG_TRACES = True
wcs/publisher.py
79 79 
    DATA_DIR = DATA_DIR
80 80 
    ERROR_LOG = ERROR_LOG
81 81 
    USE_LONG_TRACES = USE_LONG_TRACES
82 
    auto_create_appdir = AUTO_CREATE_VHOSTS
83 82 
    missing_appdir_redirect = REDIRECT_ON_UNKNOWN_VHOST
84 83 

  		




  85
  84
  
    
    supported_languages = ['fr', 'es', 'de']

  		




  ......




  117
  116
  
    
        if config.has_option("main", "use_long_traces"):

  		




  118
  117
  
    
            cls.USE_LONG_TRACES = config.getboolean("main",

  		




  119
  118
  
    
                    "use_long_traces")

  		




  120
  
  
    
        if config.has_option("main", "auto_create_appdir"):

  		




  121
  
  
    
            cls.auto_create_appdir = config.getboolean("main",

  		




  122
  
  
    
                    "auto_create_appdir")

  		




  123
  119
  
    
        if config.has_option("main", "missing_appdir_redirect"):

  		




  124
  120
  
    
            cls.missing_appdir_redirect = config.get("main",

  		




  125
  121
  
    
                    "missing_appdir_redirect")

  		












  

    
      wcs/qommon/publisher.py
    
  





  92
  92
  
    

  		




  93
  93
  
    
    site_options = None

  		




  94
  94
  
    
    site_charset = 'utf-8'

  		




  95
  
  
    
    auto_create_appdir = True

  		




  96
  95
  
    
    missing_appdir_redirect = None

  		




  97
  96
  
    
    use_sms_feature = True

  		




  98
  97
  
    

  		




  ......




  458
  457
  
    
            self.app_dir += '+' + script_name

  		




  459
  458
  
    

  		




  460
  459
  
    
        if not os.path.exists(self.app_dir):

  		




  461
  
  
    
            if not self.auto_create_appdir:

  		




  462
  
  
    
                if self.missing_appdir_redirect:

  		




  463
  
  
    
                    raise ImmediateRedirectException(self.missing_appdir_redirect)

  		




  464
  
  
    
                else:

  		




  465
  
  
    
                    raise Http404()

  		




  466
  
  
    
            try:

  		




  467
  
  
    
                os.makedirs(self.app_dir)

  		




  468
  
  
    
            except OSError as e:

  		




  469
  
  
    
                pass

  		




  
  460
  
    
            if self.missing_appdir_redirect:

  		




  
  461
  
    
                raise ImmediateRedirectException(self.missing_appdir_redirect)

  		




  
  462
  
    
            else:

  		




  
  463
  
    
                raise Http404()

  		




  470
  464
  
    

  		




  471
  465
  
    
        try:

  		




  472
  466
  
    
            os.mkdir(self.form_tokens_dir)

  		




  473
  
  
    
-