diff -r a5c6142cbfa8 -r f3b14d052798 server/serverctl.py --- a/server/serverctl.py Wed Sep 30 21:06:09 2009 +0200 +++ b/server/serverctl.py Thu Oct 01 08:49:29 2009 +0200 @@ -126,8 +126,11 @@ config = self.config print underline_title('Configuring the repository') config.input_config('email', inputlevel) - if config.pyro_enabled(): - config.input_config('pyro-server', inputlevel) + # ask for pyro configuration if pyro is activated and we're not using a + # all-in-one config, in which case this is done by the web side command + # handler + if config.pyro_enabled() and config.name != 'all-in-one': + config.input_config('pyro', inputlevel) print '\n'+underline_title('Configuring the sources') sourcesfile = config.sources_file() sconfig = Configuration(options=SOURCE_TYPES['native'].options)