summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-12-05 16:27:03 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-12-05 16:27:03 -0500
commit6bd19ac076e5d4c51317d85fd5d12965e65cae66 (patch)
tree63aa595550712d765043bac3f9015304b7a01f90
parentd0b9491bd3cea8c46d22d9e44d75bac556e03985 (diff)
downloadthird_party-cobbler-6bd19ac076e5d4c51317d85fd5d12965e65cae66.tar.gz
third_party-cobbler-6bd19ac076e5d4c51317d85fd5d12965e65cae66.tar.xz
third_party-cobbler-6bd19ac076e5d4c51317d85fd5d12965e65cae66.zip
Packaging fixups
-rw-r--r--MANIFEST.in1
-rw-r--r--cobbler.spec3
-rw-r--r--cobbler/webui/master.py4
-rw-r--r--setup.py1
4 files changed, 4 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 6cd7af4..58a1df9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -17,6 +17,7 @@ include docs/cobbler.html
include docs/wui.html
include COPYING AUTHORS README CHANGELOG
include scripts/watcher.py
+include scripts/index.py
include scripts/cobblerd
include scripts/findks.cgi
include scripts/nopxe.cgi
diff --git a/cobbler.spec b/cobbler.spec
index 10f853d..77a246f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -76,7 +76,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%defattr(755,apache,apache)
%dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py
+/var/www/cobbler/web/*.py*
%dir /var/www/cgi-bin/cobbler/
/var/www/cgi-bin/cobbler/*.cgi
@@ -128,7 +128,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/cobbler/rsync.exclude
%config(noreplace) /etc/logrotate.d/cobblerd_rotate
%config(noreplace) /etc/cobbler/modules.conf
-%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
%dir %{python_sitelib}/cobbler
%dir %{python_sitelib}/cobbler/yaml
%dir %{python_sitelib}/cobbler/modules
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py
index d4b1d2b..145fb18 100644
--- a/cobbler/webui/master.py
+++ b/cobbler/webui/master.py
@@ -33,8 +33,8 @@ VFN=valueForName
currentTime=time.time
__CHEETAH_version__ = '2.0'
__CHEETAH_versionTuple__ = (2, 0, 0, 'final', 0)
-__CHEETAH_genTime__ = 1196809899.3260081
-__CHEETAH_genTimestamp__ = 'Tue Dec 4 18:11:39 2007'
+__CHEETAH_genTime__ = 1196889987.081934
+__CHEETAH_genTimestamp__ = 'Wed Dec 5 16:26:27 2007'
__CHEETAH_src__ = 'webui_templates/master.tmpl'
__CHEETAH_srcLastModified__ = 'Tue Dec 4 17:33:59 2007'
__CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
diff --git a/setup.py b/setup.py
index 0dc44b5..e839fd6 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,6 @@ if __name__ == "__main__":
(wwwconf, ['config/cobbler.conf']),
(cobpath, ['config/cobbler_hosts']),
(etcpath, ['config/modules.conf']),
- (etcpath, ['config/auth.conf']),
(etcpath, ['config/users.digest']),
(etcpath, ['config/rsync.exclude']),
(initpath, ['config/cobblerd']),