diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | cobbler.spec | 3 | ||||
| -rw-r--r-- | cobbler/action_import.py | 2 | ||||
| -rw-r--r-- | rsync.exclude | 8 | ||||
| -rw-r--r-- | setup.py | 3 |
7 files changed, 24 insertions, 5 deletions
@@ -1,7 +1,7 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* Mon Dec 04 2006 - 0.3.4-1 +* Mon Dec 05 2006 - 0.3.4-1 - Don't rsync PPC content or ISO's on cobbler import - Manpage cleanup diff --git a/MANIFEST.in b/MANIFEST.in index 283fc5b..26a4769 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,3 +6,4 @@ include default.ks include default.pxe include cobbler.1.gz include COPYING AUTHORS README CHANGELOG NEWS +include rsync.exclude @@ -1,4 +1,12 @@ Cobbler NEWS (all entries mdehaan@redhat.com unless noted otherwise) -No NEWS is good NEWS. See CHANGELOG. +0.3.4 contains a /etc/rsync.exclude file that minimizes +the amount of files transferred during a cobbler import. By +default, PPC, ISO, and debug content are not transferred +from "cobbler import" commands. Users can customize this +file. Imports will now use less bandwidth and take up +less disk space. + + + diff --git a/cobbler.spec b/cobbler.spec index 13f8fb7..cf84b52 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -40,6 +40,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/cobbler/kickstart_fc5.ks %config(noreplace) /etc/cobbler/dhcp.template %config(noreplace) /etc/cobbler/default.pxe +%config(noreplace) /etc/cobbler/rsync.exclude %dir %{python_sitelib}/cobbler %dir %{python_sitelib}/cobbler/yaml %{python_sitelib}/cobbler/*.py* @@ -53,7 +54,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Mon Dec 04 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.4-1 +* Tue Dec 05 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.4-1 - Upstream changes (see CHANGELOG) * Tue Nov 14 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.3-1 diff --git a/cobbler/action_import.py b/cobbler/action_import.py index cbd8c36..a2d76f9 100644 --- a/cobbler/action_import.py +++ b/cobbler/action_import.py @@ -97,7 +97,7 @@ class Importer: spacer = "" if not self.mirror.startswith("rsync://"): spacer = ' -e "ssh" ' - cmd = "rsync -a %s %s /var/www/cobbler/localmirror/%s --exclude */iso/*.iso --exclude=*/ppc/debug/* --exclude=*/ppc/os/* --exclude=*/ppc/tree/* --progress" % (spacer, self.mirror, self.mirror_name) + cmd = "rsync -a %s %s /var/www/cobbler/localmirror/%s --exclude-from=/etc/cobbler/rsync.exclude --delete --delete-excluded --progress" % (spacer, self.mirror, self.mirror_name) sub_process.call(cmd,shell=True) update_file = open(os.path.join(self.path,"update.sh"),"w+") update_file.write("#!/bin/sh") diff --git a/rsync.exclude b/rsync.exclude new file mode 100644 index 0000000..9a5232f --- /dev/null +++ b/rsync.exclude @@ -0,0 +1,8 @@ +### files to exclude from "cobbler import" commands that use +### rsync mirrors. by default ISOs, PPC code, and debug +### RPM's are not transferred. Some users may want to +### re-enable debug RPM's. +**/debug/** +**/ppc/** +**/source/** +**/iso/** @@ -33,7 +33,8 @@ if __name__ == "__main__": (etcpath, ['default.ks']), (etcpath, ['dhcp.template']), (etcpath, ['default.pxe']), - (manpath, ['cobbler.1.gz']) + (manpath, ['cobbler.1.gz']), + (etcpath, ['rsync.exclude']) ], description = SHORT_DESC, long_description = LONG_DESC |