ask pyro group config questions for all-in-one config site when pyro is enabled stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Tue, 27 Apr 2010 11:23:20 +0200
branchstable
changeset 5415 6bb0c3a53589
parent 5410 3cccd5e9dd7d
child 5416 cd95e4660864
ask pyro group config questions for all-in-one config site when pyro is enabled in serverctl.py, the pyro questions are not asked for all-in-one configs, because this is webctl.py's responsibility. However for a all-in-one instance, repo_method is "in-memory" so the pyro questions would not be asked even if pyro had been explicitely enabled before.
web/webctl.py
--- a/web/webctl.py	Mon Apr 26 17:55:36 2010 +0200
+++ b/web/webctl.py	Tue Apr 27 11:23:20 2010 +0200
@@ -18,7 +18,7 @@
         """bootstrap this configuration"""
         print '\n' + underline_title('Generic web configuration')
         config = self.config
-        if config.repo_method == 'pyro':
+        if config.repo_method == 'pyro' or config.pyro_enabled():
             print '\n' + underline_title('Pyro configuration')
             config.input_config('pyro', inputlevel)
         if ASK.confirm('Allow anonymous access ?', False):