diff options
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 11 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index df278ed92..aca9895db 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -295,6 +295,7 @@ if __name__ == '__main__': } optinfo.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, 'svn': Bcfg2.Options.SERVER_SVN, + 'plugins': Bcfg2.Options.SERVER_PLUGINS, 'structures': Bcfg2.Options.SERVER_STRUCTURES, 'generators': Bcfg2.Options.SERVER_GENERATORS, 'password': Bcfg2.Options.SERVER_PASSWORD, @@ -303,11 +304,13 @@ if __name__ == '__main__': setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) if "-d" in sys.argv: - loop = infoCore(setup['repo'], setup['structures'], setup['generators'], - setup['password'], setup['svn'], setup['encoding'], True) + loop = infoCore(setup['repo'], setup['plugins'], setup['structures'], + setup['generators'], setup['password'], setup['svn'], + setup['encoding'], True) else: - loop = infoCore(setup['repo'], setup['structures'], setup['generators'], - setup['password'], setup['svn'], setup['encoding'], False) + loop = infoCore(setup['repo'], setup['plugins'], setup['structures'], + setup['generators'], setup['password'], setup['svn'], + setup['encoding'], False) if "args" in setup and setup['args']: loop.onecmd(" ".join(setup['args'])) raise SystemExit(0) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 7ee8abfdd..47f0afa1d 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -40,13 +40,16 @@ class Bcfg2Serv(Bcfg2.Component.Component): raise SetupError try: - self.Core = Core(setup['repo'], setup['structures'], + self.Core = Core(setup['repo'], setup['plugins'], setup['structures'], setup['generators'], setup['password'], setup['svn'], setup['encoding']) except CoreInitError, msg: logger.critical("Fatal error: %s" % (msg)) raise SystemExit, 1 + if 'DBStats' in self.Core.plugins: + self.fork_funcs.append("RecvStats") + self.funcs.update({ "AssertProfile" : self.Bcfg2AssertProfile, "GetConfig" : self.Bcfg2GetConfig, @@ -195,6 +198,7 @@ if __name__ == '__main__': OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, 'svn': Bcfg2.Options.SERVER_SVN, + 'plugins': Bcfg2.Options.SERVER_PLUGINS, 'structures': Bcfg2.Options.SERVER_STRUCTURES, 'generators': Bcfg2.Options.SERVER_GENERATORS, 'password': Bcfg2.Options.SERVER_PASSWORD}) |