Merge lp:~james-page/ubuntu/natty/cobbler/fix-760012 into lp:ubuntu/natty/cobbler

[James Page]

=== added directory '.pc/39_cw_remove_vhost.patch'
=== added directory '.pc/39_cw_remove_vhost.patch/config'
=== added file '.pc/39_cw_remove_vhost.patch/config/cobbler_web.conf'
--- .pc/39_cw_remove_vhost.patch/config/cobbler_web.conf	1970-01-01 00:00:00 +0000
+++ .pc/39_cw_remove_vhost.patch/config/cobbler_web.conf	2011-04-15 12:50:55 +0000
@@ -0,0 +1,14 @@
+# This configuration file enables the cobbler web
+# interface (django version)
+
+<VirtualHost *:80>
+
+# Do not log the requests generated from the event notification system
+SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
+# Log only what remains
+#CustomLog logs/access_log combined env=!dontlog
+
+WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
+
+</VirtualHost>
+

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-04-07 13:25:13 +0000
+++ .pc/applied-patches	2011-04-15 12:50:55 +0000
@@ -9,3 +9,4 @@
 36_tainted_file_path.patch
 37_koan_install_tree.patch
 38_koan_qcreate_ubuntu_support.patch
+39_cw_remove_vhost.patch

=== modified file 'config/cobbler_web.conf'
--- config/cobbler_web.conf	2011-04-04 12:55:44 +0000
+++ config/cobbler_web.conf	2011-04-15 12:50:55 +0000
@@ -1,8 +1,6 @@
 # This configuration file enables the cobbler web
 # interface (django version)
 
-<VirtualHost *:80>
-
 # Do not log the requests generated from the event notification system
 SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
 # Log only what remains
@@ -10,5 +8,3 @@
 
 WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
 
-</VirtualHost>
-

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 13:25:13 +0000
+++ debian/changelog	2011-04-15 12:50:55 +0000
@@ -1,3 +1,10 @@
+cobbler (2.1.0-0ubuntu6) natty; urgency=low
+
+  * Fix DocumentRoot conflict with default vhost (LP: #760012)
+    - debian/patches/39_cw_remove_vhost.patch: Remove VirtualHost definition. 
+
+ -- James Page <[e-mail]>  Fri, 15 Apr 2011 13:35:20 +0100
+
 cobbler (2.1.0-0ubuntu5) natty; urgency=low
 
   * Fix koan launch of Ubuntu images in KVM (LP: #751959).

=== added file 'debian/patches/39_cw_remove_vhost.patch'
--- debian/patches/39_cw_remove_vhost.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/39_cw_remove_vhost.patch	2011-04-15 12:50:55 +0000
@@ -0,0 +1,25 @@
+Description: Remove VirtualHost definition from cobbler-web Apache config
+ as this causes any DocumentRoot settings in the default vhost to be
+ lost on Ubuntu.
+Author: James Page <[e-mail]>
+Forwarded: no
+
+Index: fix-760012/config/cobbler_web.conf
+===================================================================
+--- fix-760012.orig/config/cobbler_web.conf	2011-04-15 13:31:48.310736607 +0100
++++ fix-760012/config/cobbler_web.conf	2011-04-15 13:32:18.610726223 +0100
+@@ -1,8 +1,6 @@
+ # This configuration file enables the cobbler web
+ # interface (django version)
+ 
+-<VirtualHost *:80>
+-
+ # Do not log the requests generated from the event notification system
+ SetEnvIf Request_URI ".*/op/events/user/.*" dontlog
+ # Log only what remains
+@@ -10,5 +8,3 @@
+ 
+ WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
+ 
+-</VirtualHost>
+-

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-07 13:25:13 +0000
+++ debian/patches/series	2011-04-15 12:50:55 +0000
@@ -9,3 +9,4 @@
 36_tainted_file_path.patch
 37_koan_install_tree.patch
 38_koan_qcreate_ubuntu_support.patch
+39_cw_remove_vhost.patch