File suse_config.diff of Package cobbler.import4280

--- config/cobbler.conf
+++ config/cobbler.conf	2010/07/30 12:52:50
@@ -1,11 +1,11 @@
 # This configuration file allows cobbler data
 # to be accessed over HTTP.
 
-AliasMatch ^/cblr(.*)?$ "/var/www/cobbler$1"
-AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1"
-AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1"
+AliasMatch ^/cblr(.*)?$ "/srv/www/cobbler$1"
+AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
+AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
 
-<Directory "/var/www/cobbler">
+<Directory "/srv/www/cobbler">
     Options Indexes FollowSymLinks
     Order allow,deny
     Allow from all
@@ -22,7 +22,7 @@
 # and is visited at http://.../cobbler_web not this URL.
 # this is only a pointer to the new page.
 
-<Directory "/var/www/cobbler/web/">
+<Directory "/srv/www/cobbler/web/">
     Options Indexes FollowSymLinks
     Order allow,deny
     Allow from all
@@ -30,11 +30,11 @@
 
 # service handlers for internal functions (not humans)
 
-<Directory "/var/www/cobbler/svc/">
+<Directory "/srv/www/cobbler/svc/">
     SetHandler mod_python
     PythonHandler services
     PythonDebug on
-    PythonPath "sys.path + ['/var/www/cobbler/svc/']"
+    PythonPath "sys.path + ['/srv/www/cobbler/svc/']"
 </Directory>
 
 
--- config/settings
+++ config/settings	2010/07/30 12:53:12
@@ -311,7 +311,7 @@
 # cobbler's web directory.  Don't change this setting -- see the
 # Wiki on "relocating your cobbler install" if your /var partition
 # is not large enough.
-webdir: /var/www/cobbler
+webdir: /srv/www/cobbler
 
 # cobbler's public XMLRPC listens on this port.  Change this only
 # if absolutely needed, as you'll have to start supplying a new
--- installer_templates/settings.template
+++ installer_templates/settings.template	2010/07/30 12:51:19
@@ -323,7 +323,7 @@
 # cobbler's web directory.  Don't change this setting -- see the
 # Wiki on "relocating your cobbler install" if your /var partition
 # is not large enough.
-webdir: /var/www/cobbler
+webdir: /srv/www/cobbler
 
 # cobbler's public XMLRPC listens on this port.  Change this only
 # if absolutely needed, as you'll have to start supplying a new
--- config/cobbler_wsgi.conf
+++ config/cobbler_wsgi.conf	2011/01/28 09:54:03
@@ -1,13 +1,13 @@
 # This configuration file allows cobbler data
 # to be accessed over HTTP.
 
-AliasMatch ^/cblr(?!/svc/)(.*)?$ "/var/www/cobbler$1"
-AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1"
-AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1"
+AliasMatch ^/cblr(?!/svc/)(.*)?$ "/srv/www/cobbler$1"
+AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
+AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
 
-WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.wsgi
+WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.wsgi
 
-<Directory "/var/www/cobbler">
+<Directory "/srv/www/cobbler">
     Options Indexes FollowSymLinks
     Order allow,deny
     Allow from all
@@ -24,7 +24,7 @@
 # and is visited at http://.../cobbler_web not this URL.
 # this is only a pointer to the new page.
 
-<Directory "/var/www/cobbler/web/">
+<Directory "/srv/www/cobbler/web/">
     Options Indexes FollowSymLinks
     Order allow,deny
     Allow from all