diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-03-24 11:20:07 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-03-24 11:20:07 -0500 |
commit | dab1d03d81c538966d03fb9318a4588a9e803b44 (patch) | |
tree | f51e27fa55887e9fb961766805fe43f0da56c5b9 | |
parent | 5cd6238df496a3cea178e4596ecd87967cce1ce6 (diff) | |
download | bcfg2-dab1d03d81c538966d03fb9318a4588a9e803b44.tar.gz bcfg2-dab1d03d81c538966d03fb9318a4588a9e803b44.tar.bz2 bcfg2-dab1d03d81c538966d03fb9318a4588a9e803b44.zip |
Allow to run directly from a git checkout (#1037)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r-- | doc/development/setup.txt | 7 | ||||
-rw-r--r-- | redhat/bcfg2.spec.in | 2 | ||||
-rwxr-xr-x | setup.py | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Bcfg2Py3Incompat.py (renamed from src/lib/Bcfg2Py3Incompat.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Bcfg2Py3k.py (renamed from src/lib/Bcfg2Py3k.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Frame.py (renamed from src/lib/Client/Frame.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/APK.py (renamed from src/lib/Client/Tools/APK.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py (renamed from src/lib/Client/Tools/APT.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py (renamed from src/lib/Client/Tools/Action.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Blast.py (renamed from src/lib/Client/Tools/Blast.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Chkconfig.py (renamed from src/lib/Client/Tools/Chkconfig.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/DebInit.py (renamed from src/lib/Client/Tools/DebInit.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Encap.py (renamed from src/lib/Client/Tools/Encap.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/FreeBSDInit.py (renamed from src/lib/Client/Tools/FreeBSDInit.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py (renamed from src/lib/Client/Tools/FreeBSDPackage.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/IPS.py (renamed from src/lib/Client/Tools/IPS.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/MacPorts.py (renamed from src/lib/Client/Tools/MacPorts.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX.py (renamed from src/lib/Client/Tools/POSIX.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Pacman.py (renamed from src/lib/Client/Tools/Pacman.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Portage.py (renamed from src/lib/Client/Tools/Portage.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/RPMng.py (renamed from src/lib/Client/Tools/RPMng.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/RcUpdate.py (renamed from src/lib/Client/Tools/RcUpdate.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/SMF.py (renamed from src/lib/Client/Tools/SMF.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/SYSV.py (renamed from src/lib/Client/Tools/SYSV.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Systemd.py (renamed from src/lib/Client/Tools/Systemd.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Upstart.py (renamed from src/lib/Client/Tools/Upstart.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/VCS.py (renamed from src/lib/Client/Tools/VCS.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUM24.py (renamed from src/lib/Client/Tools/YUM24.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUMng.py (renamed from src/lib/Client/Tools/YUMng.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py (renamed from src/lib/Client/Tools/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/launchd.py (renamed from src/lib/Client/Tools/launchd.py) | 0 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Client/Tools/rpmtools.py (renamed from src/lib/Client/Tools/rpmtools.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/XML.py (renamed from src/lib/Client/XML.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/__init__.py (renamed from src/lib/Client/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Component.py (renamed from src/lib/Component.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Logger.py (renamed from src/lib/Logger.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Options.py (renamed from src/lib/Options.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Proxy.py (renamed from src/lib/Proxy.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/SSLServer.py (renamed from src/lib/SSLServer.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Backup.py (renamed from src/lib/Server/Admin/Backup.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Bundle.py (renamed from src/lib/Server/Admin/Bundle.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Client.py (renamed from src/lib/Server/Admin/Client.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Compare.py (renamed from src/lib/Server/Admin/Compare.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Group.py (renamed from src/lib/Server/Admin/Group.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Init.py (renamed from src/lib/Server/Admin/Init.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Minestruct.py (renamed from src/lib/Server/Admin/Minestruct.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Perf.py (renamed from src/lib/Server/Admin/Perf.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Pull.py (renamed from src/lib/Server/Admin/Pull.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Query.py (renamed from src/lib/Server/Admin/Query.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Reports.py (renamed from src/lib/Server/Admin/Reports.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Snapshots.py (renamed from src/lib/Server/Admin/Snapshots.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Tidy.py (renamed from src/lib/Server/Admin/Tidy.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Viz.py (renamed from src/lib/Server/Admin/Viz.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Xcmd.py (renamed from src/lib/Server/Admin/Xcmd.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/__init__.py (renamed from src/lib/Server/Admin/__init__.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py (renamed from src/lib/Server/Core.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/FileMonitor.py (renamed from src/lib/Server/FileMonitor.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/.gitignore (renamed from src/lib/Server/Hostbase/.gitignore) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/__init__.py (renamed from src/lib/Server/Hostbase/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/backends.py (renamed from src/lib/Server/Hostbase/backends.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/__init__.py (renamed from src/lib/Server/Hostbase/hostbase/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/admin.py (renamed from src/lib/Server/Hostbase/hostbase/admin.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/models.py (renamed from src/lib/Server/Hostbase/hostbase/models.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/sql/zone.sql (renamed from src/lib/Server/Hostbase/hostbase/sql/zone.sql) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py (renamed from src/lib/Server/Hostbase/hostbase/urls.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/views.py (renamed from src/lib/Server/Hostbase/hostbase/views.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/base.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/base.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/confirm.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/copy.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dns.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/dns.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dnsedit.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/edit.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/edit.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/errors.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/errors.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/host.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/index.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/index.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/login.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/login.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/logout.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.tmpl (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/logout.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logviewer.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/navbar.tmpl (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/navbar.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/new.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/new.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/remove.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/remove.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/results.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/results.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/search.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneedit.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zonenew.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zones.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/zones.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html (renamed from src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/ldapauth.py (renamed from src/lib/Server/Hostbase/ldapauth.py) | 0 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Server/Hostbase/manage.py (renamed from src/lib/Server/Hostbase/manage.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/media/base.css (renamed from src/lib/Server/Hostbase/media/base.css) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css (renamed from src/lib/Server/Hostbase/media/boxypastel.css) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/media/global.css (renamed from src/lib/Server/Hostbase/media/global.css) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/media/layout.css (renamed from src/lib/Server/Hostbase/media/layout.css) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/nisauth.py (renamed from src/lib/Server/Hostbase/nisauth.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/regex.py (renamed from src/lib/Server/Hostbase/regex.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/settings.py (renamed from src/lib/Server/Hostbase/settings.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/batchadd.tmpl (renamed from src/lib/Server/Hostbase/templates/batchadd.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.conf.head (renamed from src/lib/Server/Hostbase/templates/dhcpd.conf.head) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.tmpl (renamed from src/lib/Server/Hostbase/templates/dhcpd.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/hosts.tmpl (renamed from src/lib/Server/Hostbase/templates/hosts.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/hostsappend.tmpl (renamed from src/lib/Server/Hostbase/templates/hostsappend.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/named.tmpl (renamed from src/lib/Server/Hostbase/templates/named.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/namedviews.tmpl (renamed from src/lib/Server/Hostbase/templates/namedviews.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/reverseappend.tmpl (renamed from src/lib/Server/Hostbase/templates/reverseappend.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/reversesoa.tmpl (renamed from src/lib/Server/Hostbase/templates/reversesoa.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/templates/zone.tmpl (renamed from src/lib/Server/Hostbase/templates/zone.tmpl) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/test/harness.py (renamed from src/lib/Server/Hostbase/test/harness.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/test/test_environ_settings.py (renamed from src/lib/Server/Hostbase/test/test_environ_settings.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/test/test_ldapauth.py (renamed from src/lib/Server/Hostbase/test/test_ldapauth.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/test/test_settings.py (renamed from src/lib/Server/Hostbase/test/test_settings.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Hostbase/urls.py (renamed from src/lib/Server/Hostbase/urls.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/Bundles.py (renamed from src/lib/Server/Lint/Bundles.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/Comments.py (renamed from src/lib/Server/Lint/Comments.py) | 8 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/Duplicates.py (renamed from src/lib/Server/Lint/Duplicates.py) | 2 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Server/Lint/Genshi.py (renamed from src/lib/Server/Lint/Genshi.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/GroupPatterns.py (renamed from src/lib/Server/Lint/GroupPatterns.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/InfoXML.py (renamed from src/lib/Server/Lint/InfoXML.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/MergeFiles.py (renamed from src/lib/Server/Lint/MergeFiles.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/Pkgmgr.py (renamed from src/lib/Server/Lint/Pkgmgr.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/RequiredAttrs.py (renamed from src/lib/Server/Lint/RequiredAttrs.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/Validate.py (renamed from src/lib/Server/Lint/Validate.py) | 6 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Lint/__init__.py (renamed from src/lib/Server/Lint/__init__.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py (renamed from src/lib/Server/Plugin.py) | 18 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Account.py (renamed from src/lib/Server/Plugins/Account.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/BB.py (renamed from src/lib/Server/Plugins/BB.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Base.py (renamed from src/lib/Server/Plugins/Base.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py (renamed from src/lib/Server/Plugins/Bundler.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bzr.py (renamed from src/lib/Server/Plugins/Bzr.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg.py (renamed from src/lib/Server/Plugins/Cfg.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cvs.py (renamed from src/lib/Server/Plugins/Cvs.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/DBStats.py (renamed from src/lib/Server/Plugins/DBStats.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Darcs.py (renamed from src/lib/Server/Plugins/Darcs.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Decisions.py (renamed from src/lib/Server/Plugins/Decisions.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Defaults.py (renamed from src/lib/Server/Plugins/Defaults.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Deps.py (renamed from src/lib/Server/Plugins/Deps.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Editor.py (renamed from src/lib/Server/Plugins/Editor.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/FileProbes.py (renamed from src/lib/Server/Plugins/FileProbes.py) | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Fossil.py (renamed from src/lib/Server/Plugins/Fossil.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Git.py (renamed from src/lib/Server/Plugins/Git.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/GroupPatterns.py (renamed from src/lib/Server/Plugins/GroupPatterns.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Guppy.py (renamed from src/lib/Server/Plugins/Guppy.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Hg.py (renamed from src/lib/Server/Plugins/Hg.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Hostbase.py (renamed from src/lib/Server/Plugins/Hostbase.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ldap.py (renamed from src/lib/Server/Plugins/Ldap.py) | 52 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py (renamed from src/lib/Server/Plugins/Metadata.py) | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/NagiosGen.py (renamed from src/lib/Server/Plugins/NagiosGen.py) | 6 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py (renamed from src/lib/Server/Plugins/Ohai.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Apt.py (renamed from src/lib/Server/Plugins/Packages/Apt.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Collection.py (renamed from src/lib/Server/Plugins/Packages/Collection.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Pac.py (renamed from src/lib/Server/Plugins/Packages/Pac.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/PackagesConfig.py (renamed from src/lib/Server/Plugins/Packages/PackagesConfig.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py (renamed from src/lib/Server/Plugins/Packages/PackagesSources.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Source.py (renamed from src/lib/Server/Plugins/Packages/Source.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py (renamed from src/lib/Server/Plugins/Packages/Yum.py) | 36 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py (renamed from src/lib/Server/Plugins/Packages/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Pkgmgr.py (renamed from src/lib/Server/Plugins/Pkgmgr.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py (renamed from src/lib/Server/Plugins/Probes.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Properties.py (renamed from src/lib/Server/Plugins/Properties.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Rules.py (renamed from src/lib/Server/Plugins/Rules.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SGenshi.py (renamed from src/lib/Server/Plugins/SGenshi.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py (renamed from src/lib/Server/Plugins/SSHbase.py) | 12 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSLCA.py (renamed from src/lib/Server/Plugins/SSLCA.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Snapshots.py (renamed from src/lib/Server/Plugins/Snapshots.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Statistics.py (renamed from src/lib/Server/Plugins/Statistics.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svcmgr.py (renamed from src/lib/Server/Plugins/Svcmgr.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py (renamed from src/lib/Server/Plugins/Svn.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn2.py (renamed from src/lib/Server/Plugins/Svn2.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/TCheetah.py (renamed from src/lib/Server/Plugins/TCheetah.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/TGenshi.py (renamed from src/lib/Server/Plugins/TGenshi.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/TemplateHelper.py (renamed from src/lib/Server/Plugins/TemplateHelper.py) | 10 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Trigger.py (renamed from src/lib/Server/Plugins/Trigger.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/__init__.py (renamed from src/lib/Server/Plugins/__init__.py) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/__init__.py (renamed from src/lib/Server/Reports/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/backends.py (renamed from src/lib/Server/Reports/backends.py) | 0 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Server/Reports/importscript.py (renamed from src/lib/Server/Reports/importscript.py) | 0 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Server/Reports/manage.py (renamed from src/lib/Server/Reports/manage.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/nisauth.py (renamed from src/lib/Server/Reports/nisauth.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/__init__.py (renamed from src/lib/Server/Reports/reports/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml (renamed from src/lib/Server/Reports/reports/fixtures/initial_version.xml) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/models.py (renamed from src/lib/Server/Reports/reports/models.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/sql/client.sql (renamed from src/lib/Server/Reports/reports/sql/client.sql) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/404.html (renamed from src/lib/Server/Reports/reports/templates/404.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html (renamed from src/lib/Server/Reports/reports/templates/base-timeview.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/base.html (renamed from src/lib/Server/Reports/reports/templates/base.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html (renamed from src/lib/Server/Reports/reports/templates/clients/detail.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html (renamed from src/lib/Server/Reports/reports/templates/clients/detailed-list.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html (renamed from src/lib/Server/Reports/reports/templates/clients/history.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html (renamed from src/lib/Server/Reports/reports/templates/clients/index.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html (renamed from src/lib/Server/Reports/reports/templates/clients/manage.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html (renamed from src/lib/Server/Reports/reports/templates/config_items/item.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html (renamed from src/lib/Server/Reports/reports/templates/config_items/listing.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html (renamed from src/lib/Server/Reports/reports/templates/displays/summary.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html (renamed from src/lib/Server/Reports/reports/templates/displays/timing.html) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html (renamed from src/lib/Server/Reports/reports/templates/widgets/filter_bar.html) | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc (renamed from src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html (renamed from src/lib/Server/Reports/reports/templates/widgets/page_bar.html) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py (renamed from src/lib/Server/Reports/reports/templatetags/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py (renamed from src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py (renamed from src/lib/Server/Reports/reports/templatetags/syntax_coloring.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/urls.py (renamed from src/lib/Server/Reports/reports/urls.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/reports/views.py (renamed from src/lib/Server/Reports/reports/views.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/settings.py (renamed from src/lib/Server/Reports/settings.py) | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/updatefix.py (renamed from src/lib/Server/Reports/updatefix.py) | 6 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Reports/urls.py (renamed from src/lib/Server/Reports/urls.py) | 0 | ||||
-rwxr-xr-x | src/lib/Bcfg2/Server/Reports/utils.py (renamed from src/lib/Server/Reports/utils.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Snapshots/__init__.py (renamed from src/lib/Server/Snapshots/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Snapshots/model.py (renamed from src/lib/Server/Snapshots/model.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/__init__.py (renamed from src/lib/Server/__init__.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/Statistics.py (renamed from src/lib/Statistics.py) | 0 | ||||
-rw-r--r-- | src/lib/Bcfg2/__init__.py (renamed from src/lib/__init__.py) | 0 |
213 files changed, 132 insertions, 137 deletions
diff --git a/doc/development/setup.txt b/doc/development/setup.txt index e9fc6e1e5..b04bce3fe 100644 --- a/doc/development/setup.txt +++ b/doc/development/setup.txt @@ -12,13 +12,8 @@ Checking Out a Copy of the Code git clone git://git.mcs.anl.gov/bcfg2.git -* Create link to :file:`src/lib`:: - - cd bcfg2 - ln -s src/lib Bcfg2 - * Add :file:`bcfg2/src/sbin` to your :envvar:`PATH` environment variable -* Add :file:`bcfg2` to your :envvar:`PYTHONPATH` environment variable +* Add :file:`bcfg2/src/lib` to your :envvar:`PYTHONPATH` environment variable Using a Virtual Environment for Development diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in index 02420fe56..881296533 100644 --- a/redhat/bcfg2.spec.in +++ b/redhat/bcfg2.spec.in @@ -117,7 +117,7 @@ Configuration management system documentation %{__perl} -pi -e 's@chkconfig: (\d+)@chkconfig: -@' debian/bcfg2-server.init # get rid of extraneous shebangs -for f in `find src/lib -name \*.py` +for f in `find src/lib/Bcfg2 -name \*.py` do %{__sed} -i -e '/^#!/,1d' $f done @@ -121,7 +121,7 @@ try: except ImportError: pass -py3lib = 'src/lib/Bcfg2Py3Incompat.py' +py3lib = 'src/lib/Bcfg2/Bcfg2Py3Incompat.py' if sys.hexversion < 0x03000000 and os.path.exists(py3lib): os.remove(py3lib) @@ -151,7 +151,7 @@ setup(cmdclass=cmdclass, "Bcfg2.Server.Snapshots", ], install_requires = inst_reqs, - package_dir = {'Bcfg2': 'src/lib'}, + package_dir = {'Bcfg2': 'src/lib/Bcfg2'}, package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml', 'templates/*.html', 'templates/*/*.html', 'templates/*/*.inc' ] }, @@ -167,11 +167,11 @@ setup(cmdclass=cmdclass, ('share/man/man5', glob("man/*.5")), ('share/man/man8', glob("man/*.8")), ('share/bcfg2/Hostbase/templates', - glob('src/lib/Server/Hostbase/hostbase/webtemplates/*.*')), + glob('src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/*.*')), ('share/bcfg2/Hostbase/templates/hostbase', - glob('src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/*')), + glob('src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/*')), ('share/bcfg2/Hostbase/repo', - glob('src/lib/Server/Hostbase/templates/*')), + glob('src/lib/Bcfg2/Server/Hostbase/templates/*')), ('share/bcfg2/site_media', glob('reports/site_media/*')), ] diff --git a/src/lib/Bcfg2Py3Incompat.py b/src/lib/Bcfg2/Bcfg2Py3Incompat.py index 6b66e72b0..6b66e72b0 100644 --- a/src/lib/Bcfg2Py3Incompat.py +++ b/src/lib/Bcfg2/Bcfg2Py3Incompat.py diff --git a/src/lib/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py index ee05b7e41..ee05b7e41 100644 --- a/src/lib/Bcfg2Py3k.py +++ b/src/lib/Bcfg2/Bcfg2Py3k.py diff --git a/src/lib/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index 67222f245..baac70f52 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -291,7 +291,7 @@ class Frame: if self.setup['interactive']: promptFilter(prompt, actions) self.DispatchInstallCalls(actions) - + # need to test to fail entries in whitelist if False in [self.states[a] for a in actions]: # then display bundles forced off with entries diff --git a/src/lib/Client/Tools/APK.py b/src/lib/Bcfg2/Client/Tools/APK.py index aaaf2472f..aaaf2472f 100644 --- a/src/lib/Client/Tools/APK.py +++ b/src/lib/Bcfg2/Client/Tools/APK.py diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index 6b839ffbc..6b839ffbc 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py diff --git a/src/lib/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index dc49347e9..dc49347e9 100644 --- a/src/lib/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py diff --git a/src/lib/Client/Tools/Blast.py b/src/lib/Bcfg2/Client/Tools/Blast.py index 5d5e74ab2..5d5e74ab2 100644 --- a/src/lib/Client/Tools/Blast.py +++ b/src/lib/Bcfg2/Client/Tools/Blast.py diff --git a/src/lib/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py index 12ea5f132..12ea5f132 100644 --- a/src/lib/Client/Tools/Chkconfig.py +++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py diff --git a/src/lib/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py index ca6fc439e..ca6fc439e 100644 --- a/src/lib/Client/Tools/DebInit.py +++ b/src/lib/Bcfg2/Client/Tools/DebInit.py diff --git a/src/lib/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py index fa09c3ec7..fa09c3ec7 100644 --- a/src/lib/Client/Tools/Encap.py +++ b/src/lib/Bcfg2/Client/Tools/Encap.py diff --git a/src/lib/Client/Tools/FreeBSDInit.py b/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py index 10f0f2e93..10f0f2e93 100644 --- a/src/lib/Client/Tools/FreeBSDInit.py +++ b/src/lib/Bcfg2/Client/Tools/FreeBSDInit.py diff --git a/src/lib/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py index 3e6f2b6bb..3e6f2b6bb 100644 --- a/src/lib/Client/Tools/FreeBSDPackage.py +++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py diff --git a/src/lib/Client/Tools/IPS.py b/src/lib/Bcfg2/Client/Tools/IPS.py index e30bbd2a4..e30bbd2a4 100644 --- a/src/lib/Client/Tools/IPS.py +++ b/src/lib/Bcfg2/Client/Tools/IPS.py diff --git a/src/lib/Client/Tools/MacPorts.py b/src/lib/Bcfg2/Client/Tools/MacPorts.py index e8c911390..e8c911390 100644 --- a/src/lib/Client/Tools/MacPorts.py +++ b/src/lib/Bcfg2/Client/Tools/MacPorts.py diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Bcfg2/Client/Tools/POSIX.py index 326c6e02d..9dd0362f3 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX.py @@ -495,7 +495,7 @@ class POSIX(Bcfg2.Client.Tools.Tool): (err.filename, err)) return False different = content != tempdata - + if different: if self.setup['interactive']: prompt = [entry.get('qtext', '')] diff --git a/src/lib/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py index c8c05061c..c8c05061c 100644 --- a/src/lib/Client/Tools/Pacman.py +++ b/src/lib/Bcfg2/Client/Tools/Pacman.py diff --git a/src/lib/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py index 646995f4e..646995f4e 100644 --- a/src/lib/Client/Tools/Portage.py +++ b/src/lib/Bcfg2/Client/Tools/Portage.py diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Bcfg2/Client/Tools/RPMng.py index b28bec030..00dd00d71 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Bcfg2/Client/Tools/RPMng.py @@ -453,7 +453,7 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): packages is a list of Package Entries with Instances generated by FindExtraPackages(). - + """ self.logger.debug('Running RPMng.RemovePackages()') diff --git a/src/lib/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py index 1b9a29478..1b9a29478 100644 --- a/src/lib/Client/Tools/RcUpdate.py +++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py diff --git a/src/lib/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py index f824410ad..f824410ad 100644 --- a/src/lib/Client/Tools/SMF.py +++ b/src/lib/Bcfg2/Client/Tools/SMF.py diff --git a/src/lib/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py index eb4a13dfb..eb4a13dfb 100644 --- a/src/lib/Client/Tools/SYSV.py +++ b/src/lib/Bcfg2/Client/Tools/SYSV.py diff --git a/src/lib/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py index e3f6a4169..e3f6a4169 100644 --- a/src/lib/Client/Tools/Systemd.py +++ b/src/lib/Bcfg2/Client/Tools/Systemd.py diff --git a/src/lib/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py index 7afc8edd7..7afc8edd7 100644 --- a/src/lib/Client/Tools/Upstart.py +++ b/src/lib/Bcfg2/Client/Tools/Upstart.py diff --git a/src/lib/Client/Tools/VCS.py b/src/lib/Bcfg2/Client/Tools/VCS.py index e6081dc1c..e6081dc1c 100644 --- a/src/lib/Client/Tools/VCS.py +++ b/src/lib/Bcfg2/Client/Tools/VCS.py diff --git a/src/lib/Client/Tools/YUM24.py b/src/lib/Bcfg2/Client/Tools/YUM24.py index 4e488b9da..4e488b9da 100644 --- a/src/lib/Client/Tools/YUM24.py +++ b/src/lib/Bcfg2/Client/Tools/YUM24.py diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Bcfg2/Client/Tools/YUMng.py index 154676764..154676764 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Bcfg2/Client/Tools/YUMng.py diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index c6cb6e239..c6cb6e239 100644 --- a/src/lib/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py diff --git a/src/lib/Client/Tools/launchd.py b/src/lib/Bcfg2/Client/Tools/launchd.py index 700234cc8..700234cc8 100644 --- a/src/lib/Client/Tools/launchd.py +++ b/src/lib/Bcfg2/Client/Tools/launchd.py diff --git a/src/lib/Client/Tools/rpmtools.py b/src/lib/Bcfg2/Client/Tools/rpmtools.py index 7441b2c06..7441b2c06 100755 --- a/src/lib/Client/Tools/rpmtools.py +++ b/src/lib/Bcfg2/Client/Tools/rpmtools.py diff --git a/src/lib/Client/XML.py b/src/lib/Bcfg2/Client/XML.py index 858479611..858479611 100644 --- a/src/lib/Client/XML.py +++ b/src/lib/Bcfg2/Client/XML.py diff --git a/src/lib/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 6ed37b257..6ed37b257 100644 --- a/src/lib/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py diff --git a/src/lib/Component.py b/src/lib/Bcfg2/Component.py index e21b5d359..e21b5d359 100644 --- a/src/lib/Component.py +++ b/src/lib/Bcfg2/Component.py diff --git a/src/lib/Logger.py b/src/lib/Bcfg2/Logger.py index 06aae615e..06aae615e 100644 --- a/src/lib/Logger.py +++ b/src/lib/Bcfg2/Logger.py diff --git a/src/lib/Options.py b/src/lib/Bcfg2/Options.py index 527b42d00..02ac8f646 100644 --- a/src/lib/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -347,7 +347,7 @@ CLIENT_SERVICE_MODE = Option('Set client service mode', default='default', CLIENT_TIMEOUT = Option('Set the client XML-RPC timeout', default=90, cmd='-t', cf=('communication', 'timeout'), odesc='<timeout>') - + # APT client tool options CLIENT_APT_TOOLS_INSTALL_PATH = Option('Apt tools install path', cf=('APT', 'install_path'), diff --git a/src/lib/Proxy.py b/src/lib/Bcfg2/Proxy.py index b4a7c6b41..2e653f47e 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Bcfg2/Proxy.py @@ -312,7 +312,7 @@ class XMLRPCTransport(xmlrpclib.Transport): 408, str(err), self._extra_headers)) - + if errcode != 200: raise ProxyError(xmlrpclib.ProtocolError(host + handler, errcode, diff --git a/src/lib/SSLServer.py b/src/lib/Bcfg2/SSLServer.py index 418e259cc..418e259cc 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/Bcfg2/SSLServer.py diff --git a/src/lib/Server/Admin/Backup.py b/src/lib/Bcfg2/Server/Admin/Backup.py index 3744abca3..3744abca3 100644 --- a/src/lib/Server/Admin/Backup.py +++ b/src/lib/Bcfg2/Server/Admin/Backup.py diff --git a/src/lib/Server/Admin/Bundle.py b/src/lib/Bcfg2/Server/Admin/Bundle.py index 89c099602..89c099602 100644 --- a/src/lib/Server/Admin/Bundle.py +++ b/src/lib/Bcfg2/Server/Admin/Bundle.py diff --git a/src/lib/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py index 4d580c54c..4d580c54c 100644 --- a/src/lib/Server/Admin/Client.py +++ b/src/lib/Bcfg2/Server/Admin/Client.py diff --git a/src/lib/Server/Admin/Compare.py b/src/lib/Bcfg2/Server/Admin/Compare.py index 050dd69f8..050dd69f8 100644 --- a/src/lib/Server/Admin/Compare.py +++ b/src/lib/Bcfg2/Server/Admin/Compare.py diff --git a/src/lib/Server/Admin/Group.py b/src/lib/Bcfg2/Server/Admin/Group.py index 16a773d6f..16a773d6f 100644 --- a/src/lib/Server/Admin/Group.py +++ b/src/lib/Bcfg2/Server/Admin/Group.py diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 832190b7d..832190b7d 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py diff --git a/src/lib/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py index b929a9a8c..b929a9a8c 100644 --- a/src/lib/Server/Admin/Minestruct.py +++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py diff --git a/src/lib/Server/Admin/Perf.py b/src/lib/Bcfg2/Server/Admin/Perf.py index 411442698..411442698 100644 --- a/src/lib/Server/Admin/Perf.py +++ b/src/lib/Bcfg2/Server/Admin/Perf.py diff --git a/src/lib/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py index daf353107..daf353107 100644 --- a/src/lib/Server/Admin/Pull.py +++ b/src/lib/Bcfg2/Server/Admin/Pull.py diff --git a/src/lib/Server/Admin/Query.py b/src/lib/Bcfg2/Server/Admin/Query.py index 3dd326645..3dd326645 100644 --- a/src/lib/Server/Admin/Query.py +++ b/src/lib/Bcfg2/Server/Admin/Query.py diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py index 974cdff9d..974cdff9d 100644 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Bcfg2/Server/Admin/Reports.py diff --git a/src/lib/Server/Admin/Snapshots.py b/src/lib/Bcfg2/Server/Admin/Snapshots.py index 8bc56f1f1..8bc56f1f1 100644 --- a/src/lib/Server/Admin/Snapshots.py +++ b/src/lib/Bcfg2/Server/Admin/Snapshots.py diff --git a/src/lib/Server/Admin/Tidy.py b/src/lib/Bcfg2/Server/Admin/Tidy.py index 82319b93e..82319b93e 100644 --- a/src/lib/Server/Admin/Tidy.py +++ b/src/lib/Bcfg2/Server/Admin/Tidy.py diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py index 2faa423c1..2faa423c1 100644 --- a/src/lib/Server/Admin/Viz.py +++ b/src/lib/Bcfg2/Server/Admin/Viz.py diff --git a/src/lib/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py index 140465468..140465468 100644 --- a/src/lib/Server/Admin/Xcmd.py +++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py index 5031392d0..fdb9a0972 100644 --- a/src/lib/Server/Admin/__init__.py +++ b/src/lib/Bcfg2/Server/Admin/__init__.py @@ -106,7 +106,7 @@ class MetadataCore(Mode): """Base class for admin-modes that handle metadata.""" __plugin_whitelist__ = None __plugin_blacklist__ = None - + def __init__(self, setup): Mode.__init__(self, setup) if self.__plugin_whitelist__ is not None: diff --git a/src/lib/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index cb95e3e9c..3647ee622 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -322,7 +322,7 @@ class Core(Component): except: logger.error("error in BindStructure", exc_info=1) self.validate_goals(meta, config) - + sort_xml(config, key=lambda e: e.get('name')) logger.info("Generated config for %s in %.03f seconds" % \ diff --git a/src/lib/Server/FileMonitor.py b/src/lib/Bcfg2/Server/FileMonitor.py index d6b313e6b..d6b313e6b 100644 --- a/src/lib/Server/FileMonitor.py +++ b/src/lib/Bcfg2/Server/FileMonitor.py diff --git a/src/lib/Server/Hostbase/.gitignore b/src/lib/Bcfg2/Server/Hostbase/.gitignore index 8e15b5395..8e15b5395 100644 --- a/src/lib/Server/Hostbase/.gitignore +++ b/src/lib/Bcfg2/Server/Hostbase/.gitignore diff --git a/src/lib/Server/Hostbase/__init__.py b/src/lib/Bcfg2/Server/Hostbase/__init__.py index e69de29bb..e69de29bb 100644 --- a/src/lib/Server/Hostbase/__init__.py +++ b/src/lib/Bcfg2/Server/Hostbase/__init__.py diff --git a/src/lib/Server/Hostbase/backends.py b/src/lib/Bcfg2/Server/Hostbase/backends.py index ecaf3c109..ecaf3c109 100644 --- a/src/lib/Server/Hostbase/backends.py +++ b/src/lib/Bcfg2/Server/Hostbase/backends.py diff --git a/src/lib/Server/Hostbase/hostbase/__init__.py b/src/lib/Bcfg2/Server/Hostbase/hostbase/__init__.py index e69de29bb..e69de29bb 100644 --- a/src/lib/Server/Hostbase/hostbase/__init__.py +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/__init__.py diff --git a/src/lib/Server/Hostbase/hostbase/admin.py b/src/lib/Bcfg2/Server/Hostbase/hostbase/admin.py index 70a2233cc..70a2233cc 100644 --- a/src/lib/Server/Hostbase/hostbase/admin.py +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/admin.py diff --git a/src/lib/Server/Hostbase/hostbase/models.py b/src/lib/Bcfg2/Server/Hostbase/hostbase/models.py index 3f08a09a0..3f08a09a0 100644 --- a/src/lib/Server/Hostbase/hostbase/models.py +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/models.py diff --git a/src/lib/Server/Hostbase/hostbase/sql/zone.sql b/src/lib/Bcfg2/Server/Hostbase/hostbase/sql/zone.sql index b78187ab2..b78187ab2 100644 --- a/src/lib/Server/Hostbase/hostbase/sql/zone.sql +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/sql/zone.sql diff --git a/src/lib/Server/Hostbase/hostbase/urls.py b/src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py index 0ee204abe..0ee204abe 100644 --- a/src/lib/Server/Hostbase/hostbase/urls.py +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py diff --git a/src/lib/Server/Hostbase/hostbase/views.py b/src/lib/Bcfg2/Server/Hostbase/hostbase/views.py index 57ef5eff8..57ef5eff8 100644 --- a/src/lib/Server/Hostbase/hostbase/views.py +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/views.py diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/base.html index 1d7c5565b..1d7c5565b 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/base.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/base.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/confirm.html index ca8b0cc07..ca8b0cc07 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/confirm.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/confirm.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html index 400ef58f2..400ef58f2 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/copy.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/copy.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dns.html index da179e5a1..da179e5a1 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/dns.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dns.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dnsedit.html index 18bd7ab83..b1b71ab67 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/dnsedit.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/dnsedit.html @@ -73,7 +73,7 @@ <td> <input name="{{ name.id }}priority" type="text" size="6"> <input name="{{ name.id }}mx" type="text"></td></tr> {% endfor %} - <tr> <td> <b>name</b></td> + <tr> <td> <b>name</b></td> <td> <input name="{{ ip.0.ip_addr }}name" type="text"> <select name="{{ ip.0.ip_addr }}dns_view"> {% for choice in DNS_CHOICES %} @@ -86,7 +86,7 @@ <td> <input name="{{ ip.0.ip_addr }}priority" type="text" size="6"> <input name="{{ ip.0.ip_addr }}mx" type="text"></td></tr> <tr><td></td></tr> - <tr><td><hr></td><td><hr></td></tr> + <tr><td><hr></td><td><hr></td></tr> {% endifequal %} {% endfor %} {% endfor %} diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/edit.html index 961c9d143..961c9d143 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/edit.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/edit.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/errors.html index e5429b86c..e5429b86c 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/errors.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/errors.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html index d6b8873bc..d6b8873bc 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/host.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/host.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html index 551bf3254..b5d794b50 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/host_confirm_delete.html @@ -24,7 +24,7 @@ <col width="150"> <col width="*"> <tr> <td> <b>hostname</b></td> - <td> {{ object.hostname }}</td></tr> + <td> {{ object.hostname }}</td></tr> <tr> <td> <b>whatami</b></td> <td> {{ object.whatami }}</td></tr> <tr> <td> <b>netgroup</b></td> diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html index aa9679cbd..aa9679cbd 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/hostbase/log_detail.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/index.html index 92258b648..92258b648 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/index.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/index.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/login.html index ec24a0fc0..ec24a0fc0 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/login.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/login.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.html index 994f631a8..994f631a8 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.tmpl b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.tmpl index e71e90e76..e71e90e76 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logout.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logout.tmpl diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logviewer.html index 806ccd63d..806ccd63d 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/logviewer.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/logviewer.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar.tmpl b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/navbar.tmpl index 877d427d0..877d427d0 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/navbar.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/navbar.tmpl diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/new.html index 2dcd6271f..2dcd6271f 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/new.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/new.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/remove.html index 4329200dd..4329200dd 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/remove.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/remove.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/results.html index 45b22058d..45b22058d 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/results.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/results.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html index 409d418fe..409d418fe 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/search.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/search.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneedit.html index ee355ee87..ee355ee87 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneedit.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneedit.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zonenew.html index b59fa9e3c..b59fa9e3c 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zonenew.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zonenew.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zones.html index c773e7922..c773e7922 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zones.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zones.html diff --git a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html index fa12e3ec5..fa12e3ec5 100644 --- a/src/lib/Server/Hostbase/hostbase/webtemplates/zoneview.html +++ b/src/lib/Bcfg2/Server/Hostbase/hostbase/webtemplates/zoneview.html diff --git a/src/lib/Server/Hostbase/ldapauth.py b/src/lib/Bcfg2/Server/Hostbase/ldapauth.py index f3db26f67..f3db26f67 100644 --- a/src/lib/Server/Hostbase/ldapauth.py +++ b/src/lib/Bcfg2/Server/Hostbase/ldapauth.py diff --git a/src/lib/Server/Hostbase/manage.py b/src/lib/Bcfg2/Server/Hostbase/manage.py index 5e78ea979..5e78ea979 100755 --- a/src/lib/Server/Hostbase/manage.py +++ b/src/lib/Bcfg2/Server/Hostbase/manage.py diff --git a/src/lib/Server/Hostbase/media/base.css b/src/lib/Bcfg2/Server/Hostbase/media/base.css index ddbf02165..ddbf02165 100644 --- a/src/lib/Server/Hostbase/media/base.css +++ b/src/lib/Bcfg2/Server/Hostbase/media/base.css diff --git a/src/lib/Server/Hostbase/media/boxypastel.css b/src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css index 7ae0684ef..7ae0684ef 100644 --- a/src/lib/Server/Hostbase/media/boxypastel.css +++ b/src/lib/Bcfg2/Server/Hostbase/media/boxypastel.css diff --git a/src/lib/Server/Hostbase/media/global.css b/src/lib/Bcfg2/Server/Hostbase/media/global.css index 73451e1bc..73451e1bc 100644 --- a/src/lib/Server/Hostbase/media/global.css +++ b/src/lib/Bcfg2/Server/Hostbase/media/global.css diff --git a/src/lib/Server/Hostbase/media/layout.css b/src/lib/Bcfg2/Server/Hostbase/media/layout.css index 9085cc220..9085cc220 100644 --- a/src/lib/Server/Hostbase/media/layout.css +++ b/src/lib/Bcfg2/Server/Hostbase/media/layout.css diff --git a/src/lib/Server/Hostbase/nisauth.py b/src/lib/Bcfg2/Server/Hostbase/nisauth.py index ae4c6c021..ae4c6c021 100644 --- a/src/lib/Server/Hostbase/nisauth.py +++ b/src/lib/Bcfg2/Server/Hostbase/nisauth.py diff --git a/src/lib/Server/Hostbase/regex.py b/src/lib/Bcfg2/Server/Hostbase/regex.py index 41cc0f6f0..41cc0f6f0 100644 --- a/src/lib/Server/Hostbase/regex.py +++ b/src/lib/Bcfg2/Server/Hostbase/regex.py diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Bcfg2/Server/Hostbase/settings.py index 4e641f13c..4e641f13c 100644 --- a/src/lib/Server/Hostbase/settings.py +++ b/src/lib/Bcfg2/Server/Hostbase/settings.py diff --git a/src/lib/Server/Hostbase/templates/batchadd.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/batchadd.tmpl index 74ea3c047..74ea3c047 100644 --- a/src/lib/Server/Hostbase/templates/batchadd.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/batchadd.tmpl diff --git a/src/lib/Server/Hostbase/templates/dhcpd.conf.head b/src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.conf.head index a3d19547e..a3d19547e 100644 --- a/src/lib/Server/Hostbase/templates/dhcpd.conf.head +++ b/src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.conf.head diff --git a/src/lib/Server/Hostbase/templates/dhcpd.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.tmpl index 757b263cd..757b263cd 100644 --- a/src/lib/Server/Hostbase/templates/dhcpd.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/dhcpd.tmpl diff --git a/src/lib/Server/Hostbase/templates/hosts.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/hosts.tmpl index 251cb5a79..251cb5a79 100644 --- a/src/lib/Server/Hostbase/templates/hosts.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/hosts.tmpl diff --git a/src/lib/Server/Hostbase/templates/hostsappend.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/hostsappend.tmpl index 00e0d5d04..00e0d5d04 100644 --- a/src/lib/Server/Hostbase/templates/hostsappend.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/hostsappend.tmpl diff --git a/src/lib/Server/Hostbase/templates/named.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/named.tmpl index 03e054198..03e054198 100644 --- a/src/lib/Server/Hostbase/templates/named.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/named.tmpl diff --git a/src/lib/Server/Hostbase/templates/namedviews.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/namedviews.tmpl index 52021620e..52021620e 100644 --- a/src/lib/Server/Hostbase/templates/namedviews.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/namedviews.tmpl diff --git a/src/lib/Server/Hostbase/templates/reverseappend.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/reverseappend.tmpl index 6ed520c98..6ed520c98 100644 --- a/src/lib/Server/Hostbase/templates/reverseappend.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/reverseappend.tmpl diff --git a/src/lib/Server/Hostbase/templates/reversesoa.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/reversesoa.tmpl index d142eaf7f..d142eaf7f 100644 --- a/src/lib/Server/Hostbase/templates/reversesoa.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/reversesoa.tmpl diff --git a/src/lib/Server/Hostbase/templates/zone.tmpl b/src/lib/Bcfg2/Server/Hostbase/templates/zone.tmpl index aad48d179..aad48d179 100644 --- a/src/lib/Server/Hostbase/templates/zone.tmpl +++ b/src/lib/Bcfg2/Server/Hostbase/templates/zone.tmpl diff --git a/src/lib/Server/Hostbase/test/harness.py b/src/lib/Bcfg2/Server/Hostbase/test/harness.py index befcff5c0..befcff5c0 100644 --- a/src/lib/Server/Hostbase/test/harness.py +++ b/src/lib/Bcfg2/Server/Hostbase/test/harness.py diff --git a/src/lib/Server/Hostbase/test/test_environ_settings.py b/src/lib/Bcfg2/Server/Hostbase/test/test_environ_settings.py index ad35c624e..ad35c624e 100644 --- a/src/lib/Server/Hostbase/test/test_environ_settings.py +++ b/src/lib/Bcfg2/Server/Hostbase/test/test_environ_settings.py diff --git a/src/lib/Server/Hostbase/test/test_ldapauth.py b/src/lib/Bcfg2/Server/Hostbase/test/test_ldapauth.py index 7fc009ad2..7fc009ad2 100644 --- a/src/lib/Server/Hostbase/test/test_ldapauth.py +++ b/src/lib/Bcfg2/Server/Hostbase/test/test_ldapauth.py diff --git a/src/lib/Server/Hostbase/test/test_settings.py b/src/lib/Bcfg2/Server/Hostbase/test/test_settings.py index 0dfc30f38..0dfc30f38 100644 --- a/src/lib/Server/Hostbase/test/test_settings.py +++ b/src/lib/Bcfg2/Server/Hostbase/test/test_settings.py diff --git a/src/lib/Server/Hostbase/urls.py b/src/lib/Bcfg2/Server/Hostbase/urls.py index 01fe97d4f..01fe97d4f 100644 --- a/src/lib/Server/Hostbase/urls.py +++ b/src/lib/Bcfg2/Server/Hostbase/urls.py diff --git a/src/lib/Server/Lint/Bundles.py b/src/lib/Bcfg2/Server/Lint/Bundles.py index 472915cfd..0c95f7e72 100644 --- a/src/lib/Server/Lint/Bundles.py +++ b/src/lib/Bcfg2/Server/Lint/Bundles.py @@ -1,6 +1,6 @@ import lxml.etree import Bcfg2.Server.Lint - + class Bundles(Bcfg2.Server.Lint.ServerPlugin): """ Perform various bundle checks """ @@ -41,7 +41,7 @@ class Bundles(Bcfg2.Server.Lint.ServerPlugin): except AttributeError: # genshi template xdata = lxml.etree.parse(bundle.template.filepath).getroot() - + fname = bundle.name.split('Bundler/')[1].split('.')[0] bname = xdata.get('name') if fname != bname: diff --git a/src/lib/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py index 19fae1b08..19e6c1167 100644 --- a/src/lib/Server/Lint/Comments.py +++ b/src/lib/Bcfg2/Server/Lint/Comments.py @@ -31,13 +31,13 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): fetch the list of required items from the bcfg2-lint config """ if itype not in self.config_cache: self.config_cache[itype] = {} - + if rtype not in self.config_cache[itype]: rv = [] global_item = "global_%ss" % itype if global_item in self.config: rv.extend(self.config[global_item].split(",")) - + item = "%s_%ss" % (rtype.lower(), itype) if item in self.config: if self.config[item]: @@ -128,7 +128,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): # None == found but not expanded # True == found and expanded found = dict((k, False) for k in self.required_keywords(rtype)) - + for line in lines: # we check for both '$<keyword>:' and '$<keyword>$' to see # if the keyword just hasn't been expanded @@ -155,7 +155,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): # next, check for required comments. found is just # boolean found = dict((k, False) for k in self.required_comments(rtype)) - + for line in lines: for (comment, status) in found.items(): if not status: diff --git a/src/lib/Server/Lint/Duplicates.py b/src/lib/Bcfg2/Server/Lint/Duplicates.py index 75f620603..afddebb71 100644 --- a/src/lib/Server/Lint/Duplicates.py +++ b/src/lib/Bcfg2/Server/Lint/Duplicates.py @@ -30,7 +30,7 @@ class Duplicates(Bcfg2.Server.Lint.ServerPlugin): self.groups_xdata = self.metadata.clients_xml.xdata if self.has_all_xincludes("clients.xml"): self.clients_xdata = self.metadata.clients_xml.xdata - + def duplicate_groups(self): """ find duplicate groups """ self.duplicate_entries(self.clients_xdata.xpath('//Groups/Group'), diff --git a/src/lib/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py index 552c495b2..1965f0330 100755 --- a/src/lib/Server/Lint/Genshi.py +++ b/src/lib/Bcfg2/Server/Lint/Genshi.py @@ -1,6 +1,6 @@ import genshi.template import Bcfg2.Server.Lint - + class Genshi(Bcfg2.Server.Lint.ServerPlugin): """ Check Genshi templates for syntax errors """ @@ -15,7 +15,7 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin): def check_files(self, entries, loader=None): if loader is None: loader = genshi.template.TemplateLoader() - + for eset in entries.values(): for fname, sdata in list(eset.entries.items()): if fname.endswith(".genshi") or fname.endswith(".newtxt"): diff --git a/src/lib/Server/Lint/GroupPatterns.py b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py index b69d7a5d8..2e0dffde7 100644 --- a/src/lib/Server/Lint/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Lint/GroupPatterns.py @@ -1,7 +1,7 @@ import sys import Bcfg2.Server.Lint from Bcfg2.Server.Plugins.GroupPatterns import PatternMap - + class GroupPatterns(Bcfg2.Server.Lint.ServerPlugin): """ Check Genshi templates for syntax errors """ @@ -19,7 +19,7 @@ class GroupPatterns(Bcfg2.Server.Lint.ServerPlugin): pmap = lambda p: PatternMap(p, None, groups) else: pmap = lambda p: PatternMap(None, p, groups) - + for el in entry.findall(ptype): pat = el.text try: diff --git a/src/lib/Server/Lint/InfoXML.py b/src/lib/Bcfg2/Server/Lint/InfoXML.py index 2054e23bf..2054e23bf 100644 --- a/src/lib/Server/Lint/InfoXML.py +++ b/src/lib/Bcfg2/Server/Lint/InfoXML.py diff --git a/src/lib/Server/Lint/MergeFiles.py b/src/lib/Bcfg2/Server/Lint/MergeFiles.py index ff6e3449a..56bca7931 100644 --- a/src/lib/Server/Lint/MergeFiles.py +++ b/src/lib/Bcfg2/Server/Lint/MergeFiles.py @@ -66,4 +66,4 @@ class MergeFiles(Bcfg2.Server.Lint.ServerPlugin): threshold)) return rv - + diff --git a/src/lib/Server/Lint/Pkgmgr.py b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py index 8f099163a..8f099163a 100644 --- a/src/lib/Server/Lint/Pkgmgr.py +++ b/src/lib/Bcfg2/Server/Lint/Pkgmgr.py diff --git a/src/lib/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index 55206d2ba..55206d2ba 100644 --- a/src/lib/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py diff --git a/src/lib/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py index 952a65365..012d65894 100644 --- a/src/lib/Server/Lint/Validate.py +++ b/src/lib/Bcfg2/Server/Lint/Validate.py @@ -36,7 +36,7 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): def Run(self): schemadir = self.config['schema'] - + for path, schemaname in self.filesets.items(): try: filelist = self.filelists[path] @@ -98,7 +98,7 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): self.LintError("xml-failed-to-read", "Failed to open file %s" % filename) return False - + if not schema.validate(datafile): cmd = ["xmllint"] if self.files is None: @@ -180,7 +180,7 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin): included = set([ent.get('href') for ent in xdata.findall('./{http://www.w3.org/2001/XInclude}include')]) rv = [] - + while included: try: filename = included.pop() diff --git a/src/lib/Server/Lint/__init__.py b/src/lib/Bcfg2/Server/Lint/__init__.py index 326f5b1dc..82770333a 100644 --- a/src/lib/Server/Lint/__init__.py +++ b/src/lib/Bcfg2/Server/Lint/__init__.py @@ -73,7 +73,7 @@ class Plugin (object): def LintError(self, err, msg): self.errorHandler.dispatch(err, msg) - + def RenderXML(self, element): """render an XML element for error output -- line number prefixed, no children""" diff --git a/src/lib/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index c48859a44..3cdfdbb41 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -71,7 +71,7 @@ class Debuggable(object): self.__class__.__name__) self.debug_flag = False self.logger = logging.getLogger(name) - + def toggle_debug(self): self.debug_flag = not self.debug_flag @@ -104,7 +104,7 @@ class Plugin(Debuggable): def __init__(self, core, datastore): """Initialize the plugin. - + :param core: the Bcfg2.Server.Core initializing the plugin :param datastore: the filesystem path of Bcfg2's repository """ @@ -363,7 +363,7 @@ class FileBacked(object): object.__init__(self) self.data = '' self.name = name - + def HandleEvent(self, event=None): """Read file upon update.""" if event and event.code2str() not in ['exists', 'changed', 'created']: @@ -398,7 +398,7 @@ class DirectoryBacked(object): :param data: the path to the data directory that will be monitored. :param fam: The FileMonitor object used to receive - notifications of changes. + notifications of changes. """ object.__init__(self) @@ -456,7 +456,7 @@ class DirectoryBacked(object): def HandleEvent(self, event): """Handle FAM/Gamin events. - + This method is invoked by FAM/Gamin when it detects a change to a filesystem object we have requsted to be monitored. @@ -625,7 +625,7 @@ class SingleXMLFileBacked(XMLFileBacked): class StructFile(XMLFileBacked): """This file contains a set of structure file formatting logic.""" __identifier__ = None - + def __init__(self, name): XMLFileBacked.__init__(self, name) @@ -658,7 +658,7 @@ class StructFile(XMLFileBacked): for child in item.iterchildren(): rv.extend(self._match(child, metadata)) return [rv] - + def Match(self, metadata): """Return matching fragments of independent.""" rv = [] @@ -832,7 +832,7 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked): attrs = self.get_attrs(entry, metadata) for key, val in list(attrs.items()): entry.attrib[key] = val - + def get_attrs(self, entry, metadata): """ get a list of attributes to add to the entry during the bind """ for src in self.entries.values(): @@ -1182,7 +1182,7 @@ class SimpleConfig(FileBacked, ConfigParser.SafeConfigParser): ''' a simple plugin config using ConfigParser ''' _required = True - + def __init__(self, plugin): filename = os.path.join(plugin.data, plugin.name.lower() + ".conf") self.plugin = plugin diff --git a/src/lib/Server/Plugins/Account.py b/src/lib/Bcfg2/Server/Plugins/Account.py index f2703dccb..f2703dccb 100644 --- a/src/lib/Server/Plugins/Account.py +++ b/src/lib/Bcfg2/Server/Plugins/Account.py diff --git a/src/lib/Server/Plugins/BB.py b/src/lib/Bcfg2/Server/Plugins/BB.py index c015ec47c..c015ec47c 100644 --- a/src/lib/Server/Plugins/BB.py +++ b/src/lib/Bcfg2/Server/Plugins/BB.py diff --git a/src/lib/Server/Plugins/Base.py b/src/lib/Bcfg2/Server/Plugins/Base.py index 389ca7a95..389ca7a95 100644 --- a/src/lib/Server/Plugins/Base.py +++ b/src/lib/Bcfg2/Server/Plugins/Base.py diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index ccb99481e..ccb99481e 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py diff --git a/src/lib/Server/Plugins/Bzr.py b/src/lib/Bcfg2/Server/Plugins/Bzr.py index a71021cb5..a71021cb5 100644 --- a/src/lib/Server/Plugins/Bzr.py +++ b/src/lib/Bcfg2/Server/Plugins/Bzr.py diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Bcfg2/Server/Plugins/Cfg.py index c3e807d7a..8ec31bbae 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg.py @@ -63,7 +63,7 @@ def process_delta(data, delta): basefile.write(data) basefile.close() os.close(basehandle) - + cmd = ["patch", "-u", "-f", basefile.name] patch = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) stderr = patch.communicate(input=delta.data)[1] diff --git a/src/lib/Server/Plugins/Cvs.py b/src/lib/Bcfg2/Server/Plugins/Cvs.py index 6ce72acd2..6ce72acd2 100644 --- a/src/lib/Server/Plugins/Cvs.py +++ b/src/lib/Bcfg2/Server/Plugins/Cvs.py diff --git a/src/lib/Server/Plugins/DBStats.py b/src/lib/Bcfg2/Server/Plugins/DBStats.py index 95395f74e..95395f74e 100644 --- a/src/lib/Server/Plugins/DBStats.py +++ b/src/lib/Bcfg2/Server/Plugins/DBStats.py diff --git a/src/lib/Server/Plugins/Darcs.py b/src/lib/Bcfg2/Server/Plugins/Darcs.py index 9fb9ff4f1..9fb9ff4f1 100644 --- a/src/lib/Server/Plugins/Darcs.py +++ b/src/lib/Bcfg2/Server/Plugins/Darcs.py diff --git a/src/lib/Server/Plugins/Decisions.py b/src/lib/Bcfg2/Server/Plugins/Decisions.py index b432474f2..b432474f2 100644 --- a/src/lib/Server/Plugins/Decisions.py +++ b/src/lib/Bcfg2/Server/Plugins/Decisions.py diff --git a/src/lib/Server/Plugins/Defaults.py b/src/lib/Bcfg2/Server/Plugins/Defaults.py index 718192e2a..718192e2a 100644 --- a/src/lib/Server/Plugins/Defaults.py +++ b/src/lib/Bcfg2/Server/Plugins/Defaults.py diff --git a/src/lib/Server/Plugins/Deps.py b/src/lib/Bcfg2/Server/Plugins/Deps.py index 9b848baae..9b848baae 100644 --- a/src/lib/Server/Plugins/Deps.py +++ b/src/lib/Bcfg2/Server/Plugins/Deps.py diff --git a/src/lib/Server/Plugins/Editor.py b/src/lib/Bcfg2/Server/Plugins/Editor.py index c0d2cfbad..c0d2cfbad 100644 --- a/src/lib/Server/Plugins/Editor.py +++ b/src/lib/Bcfg2/Server/Plugins/Editor.py diff --git a/src/lib/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index a76d7cac4..5beec7be0 100644 --- a/src/lib/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -131,7 +131,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, else: entrydata = entry.text - if create: + if create: self.logger.info("Writing new probed file %s" % fileloc) self.write_file(fileloc, contents) self.verify_file(filename, contents, metadata) @@ -191,7 +191,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, except Bcfg2.Server.Plugin.PluginExecutionError: tries += 1 continue - + # get current entry data if entry.get("encoding") == "base64": entrydata = binascii.a2b_base64(entry.text) @@ -200,12 +200,12 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, if entrydata == contents: updated = True tries += 1 - + def write_infoxml(self, infoxml, entry, data): """ write an info.xml for the file """ if os.path.exists(infoxml): return - + self.logger.info("Writing info.xml at %s for %s" % (infoxml, data.get("name"))) info = \ @@ -218,7 +218,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, Bcfg2.Options.MDATA_PERMS.value), encoding=entry.get("encoding", Bcfg2.Options.ENCODING.value)) - + root = lxml.etree.Element("FileInfo") root.append(info) try: diff --git a/src/lib/Server/Plugins/Fossil.py b/src/lib/Bcfg2/Server/Plugins/Fossil.py index 1b1627688..1b1627688 100644 --- a/src/lib/Server/Plugins/Fossil.py +++ b/src/lib/Bcfg2/Server/Plugins/Fossil.py diff --git a/src/lib/Server/Plugins/Git.py b/src/lib/Bcfg2/Server/Plugins/Git.py index 8f8ea87f1..8f8ea87f1 100644 --- a/src/lib/Server/Plugins/Git.py +++ b/src/lib/Bcfg2/Server/Plugins/Git.py diff --git a/src/lib/Server/Plugins/GroupPatterns.py b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py index 58b4d4afb..58b4d4afb 100644 --- a/src/lib/Server/Plugins/GroupPatterns.py +++ b/src/lib/Bcfg2/Server/Plugins/GroupPatterns.py diff --git a/src/lib/Server/Plugins/Guppy.py b/src/lib/Bcfg2/Server/Plugins/Guppy.py index 046aedc0b..eea92f30f 100644 --- a/src/lib/Server/Plugins/Guppy.py +++ b/src/lib/Bcfg2/Server/Plugins/Guppy.py @@ -12,7 +12,7 @@ python -c "from guppy import hpy;hpy().monitor()" For example: # python -c "from guppy import hpy;hpy().monitor()" -<Monitor> +<Monitor> *** Connection 1 opened *** <Monitor> lc CID PID ARGV @@ -21,7 +21,7 @@ CID PID ARGV Remote connection 1. To return to Monitor, type <Ctrl-C> or .<RETURN> <Annex> int Remote interactive console. To return to Annex, type '-'. ->>> hp.heap() +>>> hp.heap() ... diff --git a/src/lib/Server/Plugins/Hg.py b/src/lib/Bcfg2/Server/Plugins/Hg.py index 0c3537613..0c3537613 100644 --- a/src/lib/Server/Plugins/Hg.py +++ b/src/lib/Bcfg2/Server/Plugins/Hg.py diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Bcfg2/Server/Plugins/Hostbase.py index e9c1c1cff..e9c1c1cff 100644 --- a/src/lib/Server/Plugins/Hostbase.py +++ b/src/lib/Bcfg2/Server/Plugins/Hostbase.py diff --git a/src/lib/Server/Plugins/Ldap.py b/src/lib/Bcfg2/Server/Plugins/Ldap.py index 04417339b..29abf5b13 100644 --- a/src/lib/Server/Plugins/Ldap.py +++ b/src/lib/Bcfg2/Server/Plugins/Ldap.py @@ -50,7 +50,7 @@ class ConfigFile(Bcfg2.Server.Plugin.FileBacked): def Index(self): """ Reregisters the queries in the config file - + The config will take care of actually registering the queries, so we just load it once and don't keep it. """ @@ -65,21 +65,21 @@ class Ldap(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector): name = "Ldap" experimental = True debug_flag = False - + def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) Bcfg2.Server.Plugin.Connector.__init__(self) self.config = ConfigFile(self.data + "/config.py", core.fam) - + def debug_log(self, message, flag = None): if (flag is None) and self.debug_flag or flag: self.logger.error(message) - + def get_additional_data(self, metadata): query = None try: data = {} - self.debug_log("LdapPlugin debug: found queries " + + self.debug_log("LdapPlugin debug: found queries " + str(LDAP_QUERIES)) for QueryClass in LDAP_QUERIES: query = QueryClass() @@ -94,14 +94,14 @@ class Ldap(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector): except Exception: if hasattr(query, "name"): Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + - "Exception during processing of query named '" + + "Exception during processing of query named '" + str(query.name) + - "', query results will be empty" + + "', query results will be empty" + " and may cause bind failures") for line in traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2]): - Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + + Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + line.replace("\n", "")) return {} @@ -109,23 +109,23 @@ class LdapConnection(object): """ Connection to an LDAP server. """ - def __init__(self, host = "localhost", port = 389, + def __init__(self, host = "localhost", port = 389, binddn = None, bindpw = None): self.host = host self.port = port self.binddn = binddn self.bindpw = bindpw self.conn = None - + def __del__(self): if self.conn: self.conn.unbind() - + def init_conn(self): self.conn = ldap.initialize(self.url) if self.binddn is not None and self.bindpw is not None: self.conn.simple_bind_s(self.binddn, self.bindpw) - + def run_query(self, query): result = None for attempt in range(RETRY_COUNT + 1): @@ -147,17 +147,17 @@ class LdapConnection(object): self.conn = None time.sleep(RETRY_DELAY) return result - + @property def url(self): return "ldap://" + self.host + ":" + str(self.port) - + class LdapQuery(object): """ Query referencing an LdapConnection and providing several methods for query manipulation. """ - + name = "unknown" base = "" scope = "sub" @@ -165,10 +165,10 @@ class LdapQuery(object): attrs = None connection = None result = None - + def __unicode__(self): return "LdapQuery:" + self.name - + def is_applicable(self, metadata): """ Overrideable method to determine if the query is to be executed for @@ -176,27 +176,27 @@ class LdapQuery(object): Defaults to true. """ return True - + def prepare_query(self, metadata): """ Overrideable method to alter the query based on metadata. Defaults to doing nothing. In most cases, you will do something like - + self.filter = "(cn=" + metadata.hostname + ")" - + here. """ pass - + def process_result(self, metadata): """ Overrideable method to post-process the query result. Defaults to returning the unaltered result. """ return self.result - + def get_result(self, metadata): """ Method to handle preparing, executing and processing the query. @@ -207,7 +207,7 @@ class LdapQuery(object): self.result = self.process_result(metadata) return self.result else: - Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + + Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + "No valid connection defined for query " + str(self)) return None @@ -223,14 +223,14 @@ class LdapSubQuery(LdapQuery): Defaults to doing nothing. """ pass - + def process_result(self, metadata, **kwargs): """ Overrideable method to post-process the query result. Defaults to returning the unaltered result. """ return self.result - + def get_result(self, metadata, **kwargs): """ Method to handle preparing, executing and processing the query. @@ -240,6 +240,6 @@ class LdapSubQuery(LdapQuery): self.result = self.connection.run_query(self) return self.process_result(metadata, **kwargs) else: - Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + + Bcfg2.Server.Plugin.logger.error("LdapPlugin error: " + "No valid connection defined for query " + str(self)) return None diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index fa2cf0a78..f39993496 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -296,7 +296,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, if (child.tag == "Alias" and child.attrib["name"] == name): return node - return None + return None def search_group(self, group_name, tree): """Find a group.""" @@ -320,7 +320,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, for key, val in list(attribs.items()): element.set(key, val) config.write() - + def add_group(self, group_name, attribs): """Add group to groups.xml.""" return self._add_xdata(self.groups_xml, "Group", group_name, @@ -459,7 +459,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, self.private.append(group.get('name')) if 'category' in group.attrib: self.categories[group.get('name')] = group.get('category') - + for group in grouptmp: # self.groups[group] => (bundles, groups, categories) self.groups[group] = (set(), set(), {}) @@ -493,7 +493,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, self._handle_clients_xml_event(event) elif self.groups_xml.HandleEvent(event): self._handle_groups_xml_event(event) - + if False not in list(self.states.values()): # check that all client groups are real and complete real = list(self.groups.keys()) @@ -792,7 +792,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def include_group(group): return not only_client or group in clientmeta.groups - + groups_tree = lxml.etree.parse(os.path.join(self.data, "groups.xml")) try: groups_tree.xinclude() diff --git a/src/lib/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py index d67dac6a6..4dbd57d16 100644 --- a/src/lib/Server/Plugins/NagiosGen.py +++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py @@ -20,7 +20,7 @@ class NagiosGenConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked, Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, filename, fam) Bcfg2.Server.Plugin.StructFile.__init__(self, filename) - + class NagiosGen(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Generator): """NagiosGen is a Bcfg2 plugin that dynamically generates @@ -130,14 +130,14 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin, group_data = [] for host in host_configs: host_data.append(open(host, 'r').read()) - + for group in group_configs: group_name = re.sub("(-group.cfg|.*/(?=[^/]+))", "", group) if "\n".join(host_data).find(group_name) != -1: groupfile = open(group, 'r') group_data.append(groupfile.read()) groupfile.close() - + entry.text = "%s\n\n%s" % ("\n".join(group_data), "\n".join(host_data)) [entry.attrib.__setitem__(key, value) for (key, value) in list(self.server_attrib.items())] diff --git a/src/lib/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index 5fff20d98..5fff20d98 100644 --- a/src/lib/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py diff --git a/src/lib/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py index f76bf7fa1..f76bf7fa1 100644 --- a/src/lib/Server/Plugins/Packages/Apt.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py diff --git a/src/lib/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py index 32eeda1ec..59c50fe8b 100644 --- a/src/lib/Server/Plugins/Packages/Collection.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py @@ -295,7 +295,7 @@ def factory(metadata, sources, basepath, debug=False): # if sources.xml has not received a FAM event yet, defer; # instantiate a dummy Collection object return Collection(metadata, [], basepath) - + sclasses = set() relevant = list() diff --git a/src/lib/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py index 9db6b0535..486c094a6 100644 --- a/src/lib/Server/Plugins/Packages/Pac.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py @@ -63,7 +63,7 @@ class PacSource(Source): # RawURL entries assume that they only have one <Arch></Arch> # element and that it is the architecture of the source. barch = self.arches[0] - + if barch not in bdeps: bdeps[barch] = dict() bprov[barch] = dict() diff --git a/src/lib/Server/Plugins/Packages/PackagesConfig.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesConfig.py index 7950f15e6..3846c06ce 100644 --- a/src/lib/Server/Plugins/Packages/PackagesConfig.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesConfig.py @@ -2,7 +2,7 @@ import Bcfg2.Server.Plugin class PackagesConfig(Bcfg2.Server.Plugin.SimpleConfig): _required = False - + def Index(self): """ Build local data structures """ Bcfg2.Server.Plugin.SimpleConfig.Index(self) diff --git a/src/lib/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py index da79c00e9..3511cfc3d 100644 --- a/src/lib/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py @@ -8,7 +8,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, Bcfg2.Server.Plugin.StructFile, Bcfg2.Server.Plugin.Debuggable): __identifier__ = None - + def __init__(self, filename, cachepath, fam, packages, config): Bcfg2.Server.Plugin.Debuggable.__init__(self) try: diff --git a/src/lib/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py index 1dfeecc40..b33fde60a 100644 --- a/src/lib/Server/Plugins/Packages/Source.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py @@ -55,7 +55,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): self.gpgkeys = [el.text for el in xsource.findall("GPGKey")] self.recommended = xsource.get('recommended', 'false').lower() == 'true' - + self.rawurl = xsource.get('rawurl', '') if self.rawurl and not self.rawurl.endswith("/"): self.rawurl += "/" @@ -112,7 +112,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable): if os.path.exists(self.cachefile): try: self.load_state() - should_read = False + should_read = False except: self.logger.error("Packages: Cachefile %s load failed; " "falling back to file read" % self.cachefile) diff --git a/src/lib/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index e13b28251..b39b6aed2 100644 --- a/src/lib/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -68,10 +68,10 @@ def _setup_pulp(config): logger.error("Packages: Required option not found in " "Packages/packages.conf: %s" % err) raise Bcfg2.Server.Plugin.PluginInitError - + PULPCONFIG = ConsumerConfig() serveropts = PULPCONFIG.server - + PULPSERVER = server.PulpServer(serveropts['host'], int(serveropts['port']), serveropts['scheme'], @@ -85,7 +85,7 @@ class YumCollection(Collection): # options that are included in the [yum] section but that should # not be included in the temporary yum.conf we write out option_blacklist = ["use_yum_libraries", "helper"] - + def __init__(self, metadata, sources, basepath, debug=False): Collection.__init__(self, metadata, sources, basepath, debug=debug) self.keypath = os.path.join(self.basepath, "keys") @@ -103,7 +103,7 @@ class YumCollection(Collection): "cache-%s" % self.cachekey) if not os.path.exists(self.cachefile): os.mkdir(self.cachefile) - + self.configdir = os.path.join(self.basepath, "yum") if not os.path.exists(self.configdir): os.mkdir(self.configdir) @@ -120,7 +120,7 @@ class YumCollection(Collection): if not os.path.exists(self.cfgfile): yumconf = self.get_config(raw=True) yumconf.add_section("main") - + mainopts = dict(cachedir=self.cachefile, keepcache="0", sslverify="0", @@ -160,7 +160,7 @@ class YumCollection(Collection): else: rid = 1 reponame = "%s-%d" % (basereponame, rid) - + config.set(reponame, "name", reponame) config.set(reponame, "baseurl", url_map['url']) config.set(reponame, "enabled", "1") @@ -220,7 +220,7 @@ class YumCollection(Collection): remotekey = os.path.join(keydir, os.path.basename(key)) localkey = os.path.join(self.keypath, os.path.basename(key)) kdata = open(localkey).read() - + # copy the key to the client keypath = lxml.etree.Element("BoundPath", name=remotekey, encoding='ascii', @@ -293,12 +293,12 @@ class YumCollection(Collection): # include gpg key data if not has_yum: return - + try: kinfo = yum.misc.getgpgkeyinfo(keydata) version = yum.misc.keyIdToRPMVer(kinfo['keyid']) release = yum.misc.keyIdToRPMVer(kinfo['timestamp']) - + lxml.etree.SubElement(keyentry, 'Instance', version=version, release=release, @@ -378,7 +378,7 @@ class YumCollection(Collection): unknown = set([str(p) for p in result['unknown']]) self.filter_unknown(unknown) - + return packages, unknown def call_helper(self, command, input=None): @@ -404,7 +404,7 @@ class YumCollection(Collection): self.logger.error("Packages: Failed to execute %s: %s" % (" ".join(cmd), err)) return None - + if input: idata = json.dumps(input) (stdout, stderr) = helper.communicate(idata) @@ -436,7 +436,7 @@ class YumCollection(Collection): os.unlink(self.cfgfile) self.write_config() - + if force_update: self.call_helper("clean") @@ -450,7 +450,7 @@ class YumSource(Source): self.pulp_id = None if has_pulp and xsource.get("pulp_id"): self.pulp_id = xsource.get("pulp_id") - + _setup_pulp(self.config) repoapi = RepositoryAPI() try: @@ -478,7 +478,7 @@ class YumSource(Source): self.rawurl = "%s/%s" % (PULPCONFIG.cds['baseurl'], self.repo['relative_path']) self.arches = [self.repo['arch']] - + if not self.rawurl: self.baseurl = self.url + "%(version)s/%(component)s/%(arch)s/" else: @@ -500,7 +500,7 @@ class YumSource(Source): cPickle.dump((self.packages, self.deps, self.provides, self.filemap, self.url_map), cache, 2) cache.close() - + def load_state(self): if not self.use_yum: @@ -516,7 +516,7 @@ class YumSource(Source): usettings = [{'version':self.version, 'component':comp, 'arch':arch} for comp in self.components] - else: # rawurl given + else: # rawurl given usettings = [{'version':self.version, 'component':None, 'arch':arch}] @@ -534,7 +534,7 @@ class YumSource(Source): def _get_urls_from_repodata(self, url, arch): if self.use_yum: return [url] - + rmdurl = '%srepodata/repomd.xml' % url try: repomd = fetch_url(rmdurl) @@ -651,7 +651,7 @@ class YumSource(Source): def get_vpkgs(self, metadata): if self.use_yum: return dict() - + rv = Source.get_vpkgs(self, metadata) for arch, fmdata in list(self.filemap.items()): if arch not in metadata.groups and arch != 'global': diff --git a/src/lib/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index da5832e90..da5832e90 100644 --- a/src/lib/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py diff --git a/src/lib/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py index e9254cdcc..e9254cdcc 100644 --- a/src/lib/Server/Plugins/Pkgmgr.py +++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 2af3635e9..af908eee8 100644 --- a/src/lib/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -51,10 +51,10 @@ class ProbeData(object): def __str__(self): return str(self.data) - + def __repr__(self): return repr(self.data) - + def __getattr__(self, name): """ make ProbeData act like a str object """ return getattr(self.data, name) diff --git a/src/lib/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py index 680881858..680881858 100644 --- a/src/lib/Server/Plugins/Properties.py +++ b/src/lib/Bcfg2/Server/Plugins/Properties.py diff --git a/src/lib/Server/Plugins/Rules.py b/src/lib/Bcfg2/Server/Plugins/Rules.py index 684f0c290..b80ef351a 100644 --- a/src/lib/Server/Plugins/Rules.py +++ b/src/lib/Bcfg2/Server/Plugins/Rules.py @@ -50,6 +50,6 @@ class Rules(Bcfg2.Server.Plugin.PrioDir): if self._regex_cache[rule].match(entry.get('name')): return True return False - + def _regex_enabled(self): return self.config.getboolean("rules", "regex", default=False) diff --git a/src/lib/Server/Plugins/SGenshi.py b/src/lib/Bcfg2/Server/Plugins/SGenshi.py index 0ba08125e..0ba08125e 100644 --- a/src/lib/Server/Plugins/SGenshi.py +++ b/src/lib/Bcfg2/Server/Plugins/SGenshi.py diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 2e247caa7..ac281ad1a 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -22,7 +22,7 @@ class KeyData(Bcfg2.Server.Plugin.SpecificData): Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific, encoding) self.encoding = encoding - + def bind_entry(self, entry, metadata): entry.set('type', 'file') if entry.get('encoding') == 'base64': @@ -146,7 +146,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, for s in list(self.static.values())] mquery = self.core.metadata.query - + # build hostname cache names = dict() for cmeta in mquery.all(): @@ -204,13 +204,13 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, # have no clients yet. don't warn about # this. continue - + if key not in self.badnames: self.badnames[key] = True self.logger.info("Ignoring key for unknown %s %s" % (ktype, key)) continue - + skn.append("%s %s" % (','.join(hostnames), entry.data.decode().rstrip())) @@ -228,7 +228,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, action = event.code2str() if action == "endExist" or event.filename == self.data: return - + for entry in list(self.entries.values()): if entry.specific.match(event.filename): entry.handle_event(event) @@ -369,7 +369,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, else: self.logger.error("Unknown key filename: %s" % filename) return - + fileloc = "%s/%s" % (self.data, hostkey) publoc = self.data + '/' + ".".join([hostkey.split('.')[0], 'pub', "H_%s" % client]) diff --git a/src/lib/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py index 0072dc62d..0072dc62d 100644 --- a/src/lib/Server/Plugins/SSLCA.py +++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py diff --git a/src/lib/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py index aeb3b9f74..aeb3b9f74 100644 --- a/src/lib/Server/Plugins/Snapshots.py +++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py diff --git a/src/lib/Server/Plugins/Statistics.py b/src/lib/Bcfg2/Server/Plugins/Statistics.py index 265ef95a8..265ef95a8 100644 --- a/src/lib/Server/Plugins/Statistics.py +++ b/src/lib/Bcfg2/Server/Plugins/Statistics.py diff --git a/src/lib/Server/Plugins/Svcmgr.py b/src/lib/Bcfg2/Server/Plugins/Svcmgr.py index f4232ad5c..f4232ad5c 100644 --- a/src/lib/Server/Plugins/Svcmgr.py +++ b/src/lib/Bcfg2/Server/Plugins/Svcmgr.py diff --git a/src/lib/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index ae43388ea..ae43388ea 100644 --- a/src/lib/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py diff --git a/src/lib/Server/Plugins/Svn2.py b/src/lib/Bcfg2/Server/Plugins/Svn2.py index 8d79348f8..8d79348f8 100644 --- a/src/lib/Server/Plugins/Svn2.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn2.py diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Bcfg2/Server/Plugins/TCheetah.py index 8879fdef1..8879fdef1 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Bcfg2/Server/Plugins/TCheetah.py diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Bcfg2/Server/Plugins/TGenshi.py index 3ba0f4272..3ba0f4272 100644 --- a/src/lib/Server/Plugins/TGenshi.py +++ b/src/lib/Bcfg2/Server/Plugins/TGenshi.py diff --git a/src/lib/Server/Plugins/TemplateHelper.py b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py index 42eafed56..2c0ee03e0 100644 --- a/src/lib/Server/Plugins/TemplateHelper.py +++ b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) class HelperModule(Bcfg2.Server.Plugin.SpecificData): _module_name_re = re.compile(r'([^/]+?)\.py') - + def __init__(self, name, specific, encoding): Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific, encoding) @@ -18,7 +18,7 @@ class HelperModule(Bcfg2.Server.Plugin.SpecificData): else: self._module_name = name self._attrs = [] - + def handle_event(self, event): Bcfg2.Server.Plugin.SpecificData.handle_event(self, event) try: @@ -42,13 +42,13 @@ class HelperModule(Bcfg2.Server.Plugin.SpecificData): # remove old exports for sym in set(self._attrs) - set(module.__export__): delattr(self, sym) - + self._attrs = module.__export__ - + class HelperSet(Bcfg2.Server.Plugin.EntrySet): ignore = re.compile("^(\.#.*|.*~|\\..*\\.(sw[px])|.*\.py[co])$") - + def __init__(self, path, fam, encoding, plugin_name): fpattern = '[0-9A-Za-z_\-]+\.py' self.plugin_name = plugin_name diff --git a/src/lib/Server/Plugins/Trigger.py b/src/lib/Bcfg2/Server/Plugins/Trigger.py index b0d21545c..b0d21545c 100644 --- a/src/lib/Server/Plugins/Trigger.py +++ b/src/lib/Bcfg2/Server/Plugins/Trigger.py diff --git a/src/lib/Server/Plugins/__init__.py b/src/lib/Bcfg2/Server/Plugins/__init__.py index a36a9b766..f9f1b4e52 100644 --- a/src/lib/Server/Plugins/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/__init__.py @@ -7,7 +7,7 @@ __all__ = [ 'Bzr', 'Cfg', 'Cvs', - 'Darcs', + 'Darcs', 'Decisions', 'Fossil', 'Git', diff --git a/src/lib/Server/Reports/__init__.py b/src/lib/Bcfg2/Server/Reports/__init__.py index bdf908f4a..bdf908f4a 100644 --- a/src/lib/Server/Reports/__init__.py +++ b/src/lib/Bcfg2/Server/Reports/__init__.py diff --git a/src/lib/Server/Reports/backends.py b/src/lib/Bcfg2/Server/Reports/backends.py index 85241932f..85241932f 100644 --- a/src/lib/Server/Reports/backends.py +++ b/src/lib/Bcfg2/Server/Reports/backends.py diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Bcfg2/Server/Reports/importscript.py index cbdf019f5..cbdf019f5 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Bcfg2/Server/Reports/importscript.py diff --git a/src/lib/Server/Reports/manage.py b/src/lib/Bcfg2/Server/Reports/manage.py index 858bddeca..858bddeca 100755 --- a/src/lib/Server/Reports/manage.py +++ b/src/lib/Bcfg2/Server/Reports/manage.py diff --git a/src/lib/Server/Reports/nisauth.py b/src/lib/Bcfg2/Server/Reports/nisauth.py index b3e37113b..b3e37113b 100644 --- a/src/lib/Server/Reports/nisauth.py +++ b/src/lib/Bcfg2/Server/Reports/nisauth.py diff --git a/src/lib/Server/Reports/reports/__init__.py b/src/lib/Bcfg2/Server/Reports/reports/__init__.py index ccdce8943..ccdce8943 100644 --- a/src/lib/Server/Reports/reports/__init__.py +++ b/src/lib/Bcfg2/Server/Reports/reports/__init__.py diff --git a/src/lib/Server/Reports/reports/fixtures/initial_version.xml b/src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml index 919265d48..919265d48 100644 --- a/src/lib/Server/Reports/reports/fixtures/initial_version.xml +++ b/src/lib/Bcfg2/Server/Reports/reports/fixtures/initial_version.xml diff --git a/src/lib/Server/Reports/reports/models.py b/src/lib/Bcfg2/Server/Reports/reports/models.py index 870239641..870239641 100644 --- a/src/lib/Server/Reports/reports/models.py +++ b/src/lib/Bcfg2/Server/Reports/reports/models.py diff --git a/src/lib/Server/Reports/reports/sql/client.sql b/src/lib/Bcfg2/Server/Reports/reports/sql/client.sql index 8c63754c9..8c63754c9 100644 --- a/src/lib/Server/Reports/reports/sql/client.sql +++ b/src/lib/Bcfg2/Server/Reports/reports/sql/client.sql diff --git a/src/lib/Server/Reports/reports/templates/404.html b/src/lib/Bcfg2/Server/Reports/reports/templates/404.html index 168bd9fec..168bd9fec 100644 --- a/src/lib/Server/Reports/reports/templates/404.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/404.html diff --git a/src/lib/Server/Reports/reports/templates/base-timeview.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html index 842de36f0..842de36f0 100644 --- a/src/lib/Server/Reports/reports/templates/base-timeview.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/base-timeview.html diff --git a/src/lib/Server/Reports/reports/templates/base.html b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html index f541c0d2b..f541c0d2b 100644 --- a/src/lib/Server/Reports/reports/templates/base.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/base.html diff --git a/src/lib/Server/Reports/reports/templates/clients/detail.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html index dd4295f21..dd4295f21 100644 --- a/src/lib/Server/Reports/reports/templates/clients/detail.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detail.html diff --git a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html index 0c1fae8d5..0c1fae8d5 100644 --- a/src/lib/Server/Reports/reports/templates/clients/detailed-list.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/detailed-list.html diff --git a/src/lib/Server/Reports/reports/templates/clients/history.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html index 01d4ec2f4..01d4ec2f4 100644 --- a/src/lib/Server/Reports/reports/templates/clients/history.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/history.html diff --git a/src/lib/Server/Reports/reports/templates/clients/index.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html index e0c0d2d7a..e0c0d2d7a 100644 --- a/src/lib/Server/Reports/reports/templates/clients/index.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/index.html diff --git a/src/lib/Server/Reports/reports/templates/clients/manage.html b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html index 5725ae577..5725ae577 100644 --- a/src/lib/Server/Reports/reports/templates/clients/manage.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/clients/manage.html diff --git a/src/lib/Server/Reports/reports/templates/config_items/item.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html index cc99ef503..cc99ef503 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/item.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/item.html diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html index 9b1026a08..9b1026a08 100644 --- a/src/lib/Server/Reports/reports/templates/config_items/listing.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/config_items/listing.html diff --git a/src/lib/Server/Reports/reports/templates/displays/summary.html b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html index b9847cf96..b9847cf96 100644 --- a/src/lib/Server/Reports/reports/templates/displays/summary.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/summary.html diff --git a/src/lib/Server/Reports/reports/templates/displays/timing.html b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html index 47accb2cb..ff775ded5 100644 --- a/src/lib/Server/Reports/reports/templates/displays/timing.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/displays/timing.html @@ -20,7 +20,7 @@ <td>Install</td> <td>Config</td> <td>Total</td> - </tr> + </tr> {% for metric in metrics|dictsort:"name" %} <tr class='{% cycle listview,listview_alt %}'> <td><a style='font-size: 100%' diff --git a/src/lib/Server/Reports/reports/templates/widgets/filter_bar.html b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html index 6b57baf6a..6fbe585ab 100644 --- a/src/lib/Server/Reports/reports/templates/widgets/filter_bar.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/filter_bar.html @@ -2,7 +2,7 @@ {% if filters %} {% for filter, filter_url in filters %} {% if forloop.first %} - <div class="filter_bar">Active filters (click to remove): + <div class="filter_bar">Active filters (click to remove): {% endif %} <a href='{{ filter_url }}'>{{ filter|capfirst }}</a>{% if not forloop.last %}, {% endif %} {% if forloop.last %} diff --git a/src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc index 8f2dec1dc..8f2dec1dc 100644 --- a/src/lib/Server/Reports/reports/templates/widgets/interaction_list.inc +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/interaction_list.inc diff --git a/src/lib/Server/Reports/reports/templates/widgets/page_bar.html b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html index aa0def83e..aa0def83e 100644 --- a/src/lib/Server/Reports/reports/templates/widgets/page_bar.html +++ b/src/lib/Bcfg2/Server/Reports/reports/templates/widgets/page_bar.html diff --git a/src/lib/Server/Reports/reports/templatetags/__init__.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py index e69de29bb..e69de29bb 100644 --- a/src/lib/Server/Reports/reports/templatetags/__init__.py +++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/__init__.py diff --git a/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py index 629984f26..f738f7bdd 100644 --- a/src/lib/Server/Reports/reports/templatetags/bcfg2_tags.py +++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/bcfg2_tags.py @@ -81,7 +81,7 @@ def page_navigator(context): fragment['pager'] = pager fragment['page_limits'] = page_limits - + except Resolver404: path = "404" except NoReverseMatch: @@ -155,7 +155,7 @@ def isstale(timestamp, entry_max=None): """ Check for a stale timestamp - Compares two timestamps and returns True if the + Compares two timestamps and returns True if the difference is greater then 24 hours. """ if not entry_max: diff --git a/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py index 2e30125f9..2e30125f9 100644 --- a/src/lib/Server/Reports/reports/templatetags/syntax_coloring.py +++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py diff --git a/src/lib/Server/Reports/reports/urls.py b/src/lib/Bcfg2/Server/Reports/reports/urls.py index 434ce07b7..434ce07b7 100644 --- a/src/lib/Server/Reports/reports/urls.py +++ b/src/lib/Bcfg2/Server/Reports/reports/urls.py diff --git a/src/lib/Server/Reports/reports/views.py b/src/lib/Bcfg2/Server/Reports/reports/views.py index ccd71a60e..ccd71a60e 100644 --- a/src/lib/Server/Reports/reports/views.py +++ b/src/lib/Bcfg2/Server/Reports/reports/views.py diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Bcfg2/Server/Reports/settings.py index 952e3eae6..c8ceb5d88 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Bcfg2/Server/Reports/settings.py @@ -124,8 +124,8 @@ except ImportError: django.contrib.auth.LOGIN_URL = '/login' SESSION_EXPIRE_AT_BROWSER_CLOSE = True - - + + TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates". diff --git a/src/lib/Server/Reports/updatefix.py b/src/lib/Bcfg2/Server/Reports/updatefix.py index 7cebaaca9..c6593fb9c 100644 --- a/src/lib/Server/Reports/updatefix.py +++ b/src/lib/Bcfg2/Server/Reports/updatefix.py @@ -16,9 +16,9 @@ def _merge_database_table_entries(): find_cursor = connection.cursor() cursor.execute(""" Select name, kind from reports_bad - union + union select name, kind from reports_modified - union + union select name, kind from reports_extra """) # this fetch could be better done @@ -144,7 +144,7 @@ def dosync(): #we should get here if the database is new fresh = True - # ensure database connection are close, so that the management can do it's job right + # ensure database connection are close, so that the management can do it's job right try: cursor.close() connection.close() diff --git a/src/lib/Server/Reports/urls.py b/src/lib/Bcfg2/Server/Reports/urls.py index d7ff1eee5..d7ff1eee5 100644 --- a/src/lib/Server/Reports/urls.py +++ b/src/lib/Bcfg2/Server/Reports/urls.py diff --git a/src/lib/Server/Reports/utils.py b/src/lib/Bcfg2/Server/Reports/utils.py index e0b6ead59..e0b6ead59 100755 --- a/src/lib/Server/Reports/utils.py +++ b/src/lib/Bcfg2/Server/Reports/utils.py diff --git a/src/lib/Server/Snapshots/__init__.py b/src/lib/Bcfg2/Server/Snapshots/__init__.py index 7c901adb2..7c901adb2 100644 --- a/src/lib/Server/Snapshots/__init__.py +++ b/src/lib/Bcfg2/Server/Snapshots/__init__.py diff --git a/src/lib/Server/Snapshots/model.py b/src/lib/Bcfg2/Server/Snapshots/model.py index 5d7973c16..5d7973c16 100644 --- a/src/lib/Server/Snapshots/model.py +++ b/src/lib/Bcfg2/Server/Snapshots/model.py diff --git a/src/lib/Server/__init__.py b/src/lib/Bcfg2/Server/__init__.py index 96777b0bf..96777b0bf 100644 --- a/src/lib/Server/__init__.py +++ b/src/lib/Bcfg2/Server/__init__.py diff --git a/src/lib/Statistics.py b/src/lib/Bcfg2/Statistics.py index a0cb8f39b..a0cb8f39b 100644 --- a/src/lib/Statistics.py +++ b/src/lib/Bcfg2/Statistics.py diff --git a/src/lib/__init__.py b/src/lib/Bcfg2/__init__.py index 357f66f6d..357f66f6d 100644 --- a/src/lib/__init__.py +++ b/src/lib/Bcfg2/__init__.py |