diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2010-08-09 11:08:30 +0000 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-08-11 15:59:59 -0500 |
| commit | 981c0d9afb7a1369e6365c03e84bff316ea69840 (patch) | |
| tree | e21fcf7049b1a6f6b297b66ac1a22ca5e70e6915 /src/sbin/bcfg2-server | |
| parent | 4d61a9f2dcaae38ce696c1bddc3e0b943d86b90f (diff) | |
| download | bcfg2-981c0d9afb7a1369e6365c03e84bff316ea69840.tar.gz bcfg2-981c0d9afb7a1369e6365c03e84bff316ea69840.tar.bz2 bcfg2-981c0d9afb7a1369e6365c03e84bff316ea69840.zip | |
Minor layout changes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6007 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-server')
| -rwxr-xr-x | src/sbin/bcfg2-server | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 36b4c6577..cf44f1699 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -1,6 +1,6 @@ #!/usr/bin/env python -"""The XML-RPC Bcfg2 Server.""" +"""The XML-RPC Bcfg2 server.""" __revision__ = '$Revision$' import logging @@ -26,11 +26,12 @@ if __name__ == '__main__': 'to_file' : Bcfg2.Options.LOGGING_FILE_PATH, } - OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'plugins': Bcfg2.Options.SERVER_PLUGINS, - 'password': Bcfg2.Options.SERVER_PASSWORD, - 'fm': Bcfg2.Options.SERVER_FILEMONITOR, + OPTINFO.update({'repo' : Bcfg2.Options.SERVER_REPOSITORY, + 'plugins' : Bcfg2.Options.SERVER_PLUGINS, + 'password' : Bcfg2.Options.SERVER_PASSWORD, + 'fm' : Bcfg2.Options.SERVER_FILEMONITOR, }) + OPTINFO.update({'key' : Bcfg2.Options.SERVER_KEY, 'cert' : Bcfg2.Options.SERVER_CERT, 'ca' : Bcfg2.Options.SERVER_CA, @@ -39,10 +40,9 @@ if __name__ == '__main__': 'static' : Bcfg2.Options.SERVER_STATIC, 'encoding' : Bcfg2.Options.ENCODING, 'filelog' : Bcfg2.Options.LOGGING_FILE_PATH, - 'protocol' : Bcfg2.Options.SERVER_PROTOCOL, + 'protocol' : Bcfg2.Options.SERVER_PROTOCOL, }) - setup = Bcfg2.Options.OptionParser(OPTINFO) setup.parse(sys.argv[1:]) try: |