Merge pull request #450 from jimi1283/bugfixes

BUGFIX - globbed --boot-files are not copied properly
django.conf.urls.defaults was removed.

Import stuff from django.conf.urls instead. If we need to support django versions less than 1.4
then we need some compatibility stuff here.

Since 1.4 deprecated and moved to the new location.
https://docs.djangoproject.com/en/1.4/releases/1.4/#django-conf-urls-defaults

Removed in 1.6
https://docs.djangoproject.com/en/1.6/internals/deprecation/
Revert "Cleanup PXE files for systems that have netboot disabled. Fixes #618"

This reverts commit bcec38e097c1d8563503309f0c81402cf09bf4f2.

This change destroyed the functionality provided by pxe_just_once and
netboot-enabled:
The reason the pxe files are left is so that the machines are commanded,
via pxe, to boot from the local drive. Once the pxe files are deleted,
each machine will now boot using whatever is in /tftboot/.../default,
which is NOT what should happen. The netboot-enabled flag has no control
of the individual bios configs on the machines, the whole idea if
netboot-enabled is that if a machine does pxe-boot but is disabled,
no installation is attempted.

I suggest this feature be rethought, and when added done so in a way
that is guaranteed to not impact existing users and to guarantee that
a machine with netboot-enable = false will be forced to boot from
the local drive.
cobbler.spec - don't overwrite generated files

Commits f550ad5485430ee7c6bd7554a0fe4a45456d7b49 and
9eb1f39df9d9c430cc30fadd271a6df69f21ce43, changed the httpd/*.conf
and cobblerd.service files to be generated. Include the
generated versions into the rpms.
Merge pull request #685 from mark987/issue_618

Revert "Cleanup PXE files for systems that have netboot disabled. Fixes ...
Merge pull request #684 from mark987/fix-rpm-httpd

cobbler.spec - don't overwrite generated httpd files
Merge pull request #666 from jansenm/mjansen/django-compat

django.conf.urls.defaults was removed.
Merge remote branch 'upstream/bugfixes'
Fix cnames in the web GUI
Merge pull request #689 from tonykew/master

Fix cnames in the cobbler web gui
Fix error in logger code
Merge pull request #691 from dealnews/pr_puppet_log_errors

Fix error in logger code
Fix rendering of relative path template-files

Arbitrary template files with a relative destination path were not being
rendered via the web interface.  This bug also created directories in
the web root when write_files=False.  This fix adds an additional check
for the write_files boolean to correct the above behavior.
cobbler.spec - do not require tftp-server

Cobbler can use dnsmasq's tftp server, or in.tftpd, or the tftpd
provdided with Cobbler itself. Depending upon the configuration,
tftp-server may not be used and therefore its installation should
not be required.
anamon - add ks-pre.log to file list
post_anamon - add ks-post.log to files grabbed
Merge pull request #694 from jjneely/relative-template-files

Fix rendering of relative path template-files
Remove unused manage_import_*

These files are all unused since commit 211ea577f5b1572224dd15cd ,
which added the more generic manage_import_signatures.py.
manage_import_signatures - don't run createrepo if not needed (#647)

rhel6.0 switched to using yum natively for installs and updates, as did
the contemporary fedora. Such disks / distros already have perfectly
usable yum repodata, running createrepo is at best unnecessary, but
as noted in issue #xxx, can also destroy important data provided by
the upstream vendor.

rhel 4.x and earlier did not use yum, have no repodata on the disks,
so createrepo is needed and will be run.

This code uses a simple heuristic - if the "repodata" directory exists,
it is presumed valid and left untouched.

Tested on rhel6.4, rhel6.5, and rhel5.10, and fedora20 installation
disks, all worked as expected, and all resulted in a useable installation
tree.
Merge pull request #695 from mark987/anamon

Anamon