# HG changeset patch # User Alexandre Fayolle # Date 1272360200 -7200 # Node ID 6bb0c3a53589fec1939346f6b73531a7f9b8d8f3 # Parent 3cccd5e9dd7d245376cad704fbed4784ac9b6c97 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. diff -r 3cccd5e9dd7d -r 6bb0c3a53589 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):