diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | cobbler.spec | 1 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 6 | ||||
| -rw-r--r-- | config/cobbler.conf | 12 | ||||
| -rw-r--r-- | config/cobbler_webui.conf | 14 | ||||
| -rw-r--r-- | setup.py | 2 |
7 files changed, 23 insertions, 17 deletions
@@ -1,7 +1,7 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* Mon Oct 08 2007 - 0.6.3 +* Mon Oct 29 2007 - 0.6.3 - Be able to define and use Multiple NICs per system - Use server address not @@server in repo config files - Add --virt-cpus to profile editing @@ -10,6 +10,8 @@ Cobbler CHANGELOG - Added serializer_shelve for added performance/persistance over YAML - Backup state and migrate structures upon RPM upgrade - Added some more unsupported distros to the rsync.exclude file +- pre-sync and post-sync triggers, service restarts are now in /var/lib/cobbler/triggers +- webui now uses htaccess * Fri Sep 28 2007 - 0.6.2 - cobbler repo auto-add to discover yum repos automatically diff --git a/MANIFEST.in b/MANIFEST.in index 85ba1ef..3b4a785 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,7 @@ include loaders/COPYING_ELILO include loaders/elilo-3.6-ia64.efi include loaders/menu.c32 include config/cobbler.conf +include config/cobbler_webui.conf include config/rsync.exclude include config/cobblerd include config/cobblerd_rotate diff --git a/cobbler.spec b/cobbler.spec index 8d7462e..a1ac739 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -142,6 +142,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/cobbler.1.gz /etc/init.d/cobblerd %config(noreplace) /etc/httpd/conf.d/cobbler.conf +%config(noreplace) /etc/httpd/conf.d/cobbler_webui.conf %config(noreplace) /var/www/cgi-bin/cobbler/.htaccess %dir /var/log/cobbler/syslog diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index ee20ed7..7717496 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,10 +33,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1193430296.732923 -__CHEETAH_genTimestamp__ = 'Fri Oct 26 13:24:56 2007' +__CHEETAH_genTime__ = 1193690680.709156 +__CHEETAH_genTimestamp__ = 'Mon Oct 29 16:44:40 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' -__CHEETAH_srcLastModified__ = 'Fri Oct 26 11:41:47 2007' +__CHEETAH_srcLastModified__ = 'Mon Oct 29 16:39:12 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: diff --git a/config/cobbler.conf b/config/cobbler.conf index 1b0244f..187e63e 100644 --- a/config/cobbler.conf +++ b/config/cobbler.conf @@ -22,16 +22,4 @@ ProxyPassReverse /cobbler_api http://localhost:25151/ ProxyPass /cobbler_api_rw http://localhost:25152/ ProxyPassReverse /cobbler_api_rw http://localhost:25152/ -# See: http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#msie -BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On - -# set up digest authentication for the webui -# to add users: htdigest /var/www/cgi-bin/cobbler/.htaccess "Cobbler WebUI Authentication" $username -<Location "/var/www/cgi-bin/cobbler/webui.cgi"> - AuthType Digest - AuthName "Cobbler WebUI Authentication" - AuthDigestProvider file - AuthUserFile /var/www/cgi-bin/cobbler/.htaccess - Require valid-user -</Location> diff --git a/config/cobbler_webui.conf b/config/cobbler_webui.conf new file mode 100644 index 0000000..d573dd7 --- /dev/null +++ b/config/cobbler_webui.conf @@ -0,0 +1,14 @@ + +# See: http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#msie +BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On + +# set up digest authentication for the webui +# to add users: htdigest /var/www/cgi-bin/cobbler/.htaccess "Cobbler WebUI Authentication" $username +<Location "/var/www/cgi-bin/cobbler/webui.cgi"> + AuthType Digest + AuthName "Cobbler WebUI Authentication" + AuthDigestProvider file + AuthUserFile /var/www/cgi-bin/cobbler/.htaccess + Require valid-user +</Location> + @@ -66,7 +66,7 @@ if __name__ == "__main__": # miscellaneous config files (cgipath, ['config/.htaccess']), (rotpath, ['config/cobblerd_rotate']), - (wwwconf, ['config/cobbler.conf']), + (wwwconf, ['config/cobbler.conf','config/cobbler_webui.conf']), (cobpath, ['config/cobbler_hosts']), (etcpath, ['config/modules.conf']), (etcpath, ['config/auth.conf']), |