diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | cobbler.spec | 8 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 7 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rwxr-xr-x | scripts/webui.cgi (renamed from scripts/cobbler_webui.cgi) | 0 | ||||
| -rw-r--r-- | setup.py | 4 |
7 files changed, 16 insertions, 10 deletions
@@ -17,6 +17,7 @@ Cobbler CHANGELOG - WebUI - packaged /var/lib/cobbler/settings as a config file - added BuildRequires to help build on other platforms +- relocate cgi-bin files to cgi-bin/cobbler for namespacing * Thu Aug 30 2007 - 0.6.1 - re enable --resolve in yumdownloader (cobbler repo mgmt feature) diff --git a/MANIFEST.in b/MANIFEST.in index 48b7b23..1160d2f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -18,7 +18,7 @@ include scripts/watcher.py include scripts/cobblerd include scripts/findks.cgi include scripts/nopxe.cgi -include scripts/cobbler_webui.cgi +include scripts/webui.cgi include snippets/* recursive-include po *.pot recursive-include po *.po diff --git a/cobbler.spec b/cobbler.spec index 2f8fca8..96ce8c4 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -73,9 +73,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %files %defattr(755,apache,apache) -/var/www/cgi-bin/findks.cgi -/var/www/cgi-bin/nopxe.cgi -/var/www/cgi-bin/cobbler_webui.cgi +%dir /var/www/cgi-bin/cobbler/ +/var/www/cgi-bin/cobbler/findks.cgi +/var/www/cgi-bin/cobbler/nopxe.cgi +/var/www/cgi-bin/cobbler/webui.cgi %defattr(755,apache,apache) %dir /usr/share/cobbler/webui_templates @@ -180,6 +181,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT - added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms - permissions cleanup - make license field conform to rpmlint +- relocate cgi-bin files to cobbler subdirectory * Thu Aug 30 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.1-2 - Upstream changes (see CHANGELOG) diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 0a0c263..69f66b6 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -357,9 +357,12 @@ class BootSync: * signal the status watcher we're done * disable PXE if needed * save the original kickstart file for debug - """ + "" + + # FIXME: watcher is more of a request than a packaged file + # we should eventually package something and let it do something important" pattern1 = "wget http://%s/cblr/watcher.py?%s_%s=%s -b" - pattern2 = "wget http://%s/cgi-bin/nopxe.cgi?system=%s -b" + pattern2 = "wget http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s -b" pattern3 = "wget http://%s/cobbler/%s/%s/ks.cfg -O /root/cobbler.ks" blend_this = profile diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 0ccdc81..7fc1d6a 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1190142943.107908 -__CHEETAH_genTimestamp__ = 'Tue Sep 18 15:15:43 2007' +__CHEETAH_genTime__ = 1190239979.666712 +__CHEETAH_genTimestamp__ = 'Wed Sep 19 18:12:59 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Tue Sep 18 15:11:43 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' diff --git a/scripts/cobbler_webui.cgi b/scripts/webui.cgi index 899610c..899610c 100755 --- a/scripts/cobbler_webui.cgi +++ b/scripts/webui.cgi @@ -39,7 +39,7 @@ if __name__ == "__main__": tftp_cfg = "/tftpboot/pxelinux.cfg" tftp_images = "/tftpboot/images" rotpath = "/etc/logrotate.d" - cgipath = "/var/www/cgi-bin" + cgipath = "/var/www/cgi-bin/cobbler" setup( name="cobbler", version = VERSION, @@ -58,7 +58,7 @@ if __name__ == "__main__": # cgi files (cgipath, ['scripts/findks.cgi', 'scripts/nopxe.cgi']), - (cgipath, ['scripts/cobbler_webui.cgi']), + (cgipath, ['scripts/webui.cgi']), # miscellaneous config files (rotpath, ['config/cobblerd_rotate']), |