Fixed bug #956264

• Files Changed
• Browse Source

Replace builddate with changelog date to fix build-compare (bsc#969538)

• Files Changed
• Browse Source

Fixed changelog to mention the removal of the fix-initscript.diff patch

• Files Changed
• Browse Source

Fix changelog: restored old version, added lastest changes on top of it

• Files Changed
• Browse Source

- Added 'fix_test_create_systems.diff': fixes the "create_systens" unit test

- Fix runtime dependency: ensure the yaml module is available.

- Install the right cobblerd.service file

- Do not ship cobbler_web.conf inside of the cobbler package, get rid
  of part of our patches to setup.py,

- Added new patch required to fix the broken unit tests:
  * fix-broken-tests.diff

- Removed another no longer needed patch:
  * fix-textmode-for-SUSE.dif

- Update to latest stable version of cobbler (2.6.6)
- Removed no longer needed patches
  * bnc_877009.patch
  * cobbler-2.4.2-Fix-koan-s-get_insert_script.patch
  * fix-broken-tests.diff
  * suse_config.diff
- Fixed old patches to apply against the new code:
  * catch_cheetah_exception.patch
  * grubby-compat.diff
  * setup_py.diff
- Fixed and error 'grubby-compat.diff' patch which broke koan tool
- Added bnc_877009.patch, fixes CVE-2014-3225: cobbler: Local files
  inclusion (bnc#877009)

- Remove patch which automatically escapes cobbler templates.

• Files Changed
• Browse Source

- Fix the broken unit tests

- Created sub package for unit tests

• Files Changed
• Browse Source

Forgot to add patches to the project

• Files Changed
• Browse Source

- use fdupes only on SUSE

- Fix for re-installation of machines on SLE with static
  network configuration (bnc#883487)
- Added patches:
  * cobbler-2.4.2-Fix-koan-s-get_insert_script.patch
  * cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch

- fix port guessing in koan (bsc#855389)
  * fix-koan-port-guessing.dif
- add "copy-default" option to grubby-compat (bsc#855389)
- handle elilo in SUSE (bsc#855389)

- fix wrong option "text" in SUSE environment (bsc#901058)
  * fix-textmode-for-SUSE.dif

• Files Changed
• Browse Source

- Added do_not_use_grubby_compat_when_grub2_is_in_use.diff: prevents
  usage of grubby-compat when grub2 is active. Use grub2 features
  do modify the boot loader.

• Files Changed
• Browse Source

- Moved grubby-compat inside of the koan sub-package. The scrit was accidentally
  moved into the cobbler package.

• Files Changed
• Browse Source

- Added fix_sle_detection.patch: ensures SLE12 is properly detected.

• Files Changed
• Browse Source

- Did some cleanup of the spec file.

• Files Changed
• Browse Source

- Fix source of cobbler package inside of spec file (required by openSUSE:Factory)

• Files Changed
• Browse Source

- Added bnc_877009.patch, fixes CVE-2014-3225: cobbler: Local file inclusion (bnc#877009)

• Files Changed
• Browse Source

- Got rid of some of the rpmlint warnings.
- Fixed error inside of koan tool introduced by the 'grubby-compat.diff' patch.

• Files Changed
• Browse Source

- Requires tfpt-server but atftp/tftpt packages provide tfpt(server)
- Added conditional requires for s390x and syslinux-x86_64
- Added patches:
  + catch_cheetah_exception.patch 
      - forward cheetah exception as 500 SERVER ERROR (bnc#787879)
  + disable_not_relevant_checks_bnc_828453.patch
  + fence_ipmitool.sh
    - add fence_ipmitool script for power management
  + fix-powermanagement-status.dif
    - fix evaluation of power status calls
  + fix-restart-paravirt-xen.dif
    - fix XEN fullvirt installation
  + grubby-compat.diff
  + koan_old_cobbler_compat.diff
    - add new grubby-compat tool
  + looking_for_cobbler_order_changed.diff
    - fix cobbler checks on SUSE (bnc#828453)
  + setup_py.diff
    - update paths for suse apache
  
- Modified fix-initscript.diff -Failed to patch due to new line in newer version
- Removed patches:
  - suse_newver.patch - Upstreamed
  - users_patch.diff - Upstreamed
  - cheetah_template_autoescape.patch - No longer needed 

- update to version 2.4.2
  + Adding support for gPXE
  + Adding support for ESXi5
  + fix install=... kernel parameter when importing a SUSE distro

• Files Changed
• Browse Source

fix mkisofs dependency for SUSE

• Files Changed
• Browse Source

drop mkisofs

• Files Changed
• Browse Source

rediff
--This line, and those below, will be ignored--

M    suse_newver.patch
M    users_patch.diff

Diff for working copy: .
Index: suse_newver.patch
===================================================================

--- suse_newver.patch	(revision 54)
+++ suse_newver.patch	(working copy)
@@ -1,83 +1,85 @@
---- config/distro_signatures.json
-+++ config/distro_signatures.json
-@@ -263,6 +263,38 @@
-     "kernel_options_post":"",
-     "boot_files":[]
-    },
-+   "opensuse12.3": {
-+    "signatures":["suse"],
-+    "version_file":"openSUSE-release-12.3-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"(linux|vmlinuz(.*))",
-+    "initrd_file":"initrd(.*)",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-+   "opensuse13.1": {
-+    "signatures":["suse"],
-+    "version_file":"openSUSE-release-13.1-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"(linux|vmlinuz(.*))",
-+    "initrd_file":"initrd(.*)",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-    "sles11": {
-     "signatures":["suse"],
-     "version_file":"sles-release-11-(.*).rpm",
-@@ -298,6 +330,22 @@
-    "sles11sp2": {
-     "signatures":["suse"],
-     "version_file":"sles-release-11.2-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64","ppc64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"linux[64.gz]?",
-+    "initrd_file":"initrd[64]?",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-+   "sles11sp3": {
-+    "signatures":["suse"],
-+    "version_file":"sles-release-11.3-(.*).rpm",
-     "version_file_regex":null,
-     "kernel_arch":"kernel-(.*)\\.rpm",
-     "kernel_arch_regex":null,
---- newtests/cli/imports/test_suse/suse_import_test.py
-+++ newtests/cli/imports/test_suse/suse_import_test.py
-@@ -18,9 +18,16 @@
-  {"name":"opensuse12.1-x86_64", "desc":"OpenSuSE 12.1 x86_64", "path":"/vagrant/distros/opensuse12.1_x86_64"},
-  {"name":"opensuse12.2-i386", "desc":"OpenSuSE 12.2 i586", "path":"/vagrant/distros/opensuse12.2_i586"},
-  {"name":"opensuse12.2-x86_64", "desc":"OpenSuSE 12.2 x86_64", "path":"/vagrant/distros/opensuse12.2_x86_64"},
-+ {"name":"opensuse12.3-i386", "desc":"OpenSuSE 12.3 i586", "path":"/vagrant/distros/opensuse12.3_i586"},
-+ {"name":"opensuse12.3-x86_64", "desc":"OpenSuSE 12.3 x86_64", "path":"/vagrant/distros/opensuse12.3_x86_64"},
-+ {"name":"opensuse13.1-i386", "desc":"OpenSuSE 13.1 i586", "path":"/vagrant/distros/opensuse13.1_i586"},
-+ {"name":"opensuse13.1-x86_64", "desc":"OpenSuSE 13.1 x86_64", "path":"/vagrant/distros/opensuse13.1_x86_64"},
-  {"name":"sles11_sp2-i386", "desc":"SLES 11 SP2 i586", "path":"/vagrant/distros/sles11_sp2_i586"},
-  {"name":"sles11_sp2-x86_64", "desc":"SLES 11 SP2 x86_64", "path":"/vagrant/distros/sles11_sp2_x86_64"},
-  {"name":"sles11_sp2-ppc64", "desc":"SLES 11 SP2 ppc64", "path":"/vagrant/distros/sles11_sp2_ppc64"},
-+ {"name":"sles11_sp3-i386", "desc":"SLES 11 SP3 i586", "path":"/vagrant/distros/sles11_sp3_i586"},
-+ {"name":"sles11_sp3-x86_64", "desc":"SLES 11 SP3 x86_64", "path":"/vagrant/distros/sles11_sp3_x86_64"},
-+ {"name":"sles11_sp3-ppc64", "desc":"SLES 11 SP3 ppc64", "path":"/vagrant/distros/sles11_sp3_ppc64"},
- ]
- 
- for i in range(0,len(distros)):
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/distro_signatures.json ./config/distro_signatures.json
+--- ../orig-cobbler-cobbler-2.4.0-1/config/distro_signatures.json	2013-06-20 07:42:48.000000000 +0200
++++ ./config/distro_signatures.json	2013-08-13 13:45:15.437507529 +0200
+@@ -295,6 +295,38 @@
+     "kernel_options_post":"",
+     "boot_files":[]
+    },
++   "opensuse12.3": {
++    "signatures":["suse"],
++    "version_file":"openSUSE-release-12.3-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"(linux|vmlinuz(.*))",
++    "initrd_file":"initrd(.*)",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
++   "opensuse13.1": {
++    "signatures":["suse"],
++    "version_file":"openSUSE-release-13.1-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"(linux|vmlinuz(.*))",
++    "initrd_file":"initrd(.*)",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
+    "sles11": {
+     "signatures":["suse"],
+     "version_file":"sles-release-11-(.*).rpm",
+@@ -333,6 +365,22 @@
+     "version_file_regex":null,
+     "kernel_arch":"kernel-(.*)\\.rpm",
+     "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64","ppc64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"linux[64.gz]?",
++    "initrd_file":"initrd[64]?",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
++   "sles11sp3": {
++    "signatures":["suse"],
++    "version_file":"sles-release-11.3-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
+     "supported_arches":["i386","i586","x86_64","ppc64"],
+     "supported_repo_breeds":["yum"],
+     "kernel_file":"linux[64.gz]?",
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/newtests/cli/imports/test_suse/suse_import_test.py ./newtests/cli/imports/test_suse/suse_import_test.py
+--- ../orig-cobbler-cobbler-2.4.0-1/newtests/cli/imports/test_suse/suse_import_test.py	2013-06-20 07:42:48.000000000 +0200
++++ ./newtests/cli/imports/test_suse/suse_import_test.py	2013-08-13 13:43:48.513881642 +0200
+@@ -18,9 +18,16 @@
+  {"name":"opensuse12.1-x86_64", "desc":"OpenSuSE 12.1 x86_64", "path":"/vagrant/distros/opensuse12.1_x86_64"},
+  {"name":"opensuse12.2-i386", "desc":"OpenSuSE 12.2 i586", "path":"/vagrant/distros/opensuse12.2_i586"},
+  {"name":"opensuse12.2-x86_64", "desc":"OpenSuSE 12.2 x86_64", "path":"/vagrant/distros/opensuse12.2_x86_64"},
++ {"name":"opensuse12.3-i386", "desc":"OpenSuSE 12.3 i586", "path":"/vagrant/distros/opensuse12.3_i586"},
++ {"name":"opensuse12.3-x86_64", "desc":"OpenSuSE 12.3 x86_64", "path":"/vagrant/distros/opensuse12.3_x86_64"},
++ {"name":"opensuse13.1-i386", "desc":"OpenSuSE 13.1 i586", "path":"/vagrant/distros/opensuse13.1_i586"},
++ {"name":"opensuse13.1-x86_64", "desc":"OpenSuSE 13.1 x86_64", "path":"/vagrant/distros/opensuse13.1_x86_64"},
+  {"name":"sles11_sp2-i386", "desc":"SLES 11 SP2 i586", "path":"/vagrant/distros/sles11_sp2_i586"},
+  {"name":"sles11_sp2-x86_64", "desc":"SLES 11 SP2 x86_64", "path":"/vagrant/distros/sles11_sp2_x86_64"},
+  {"name":"sles11_sp2-ppc64", "desc":"SLES 11 SP2 ppc64", "path":"/vagrant/distros/sles11_sp2_ppc64"},
++ {"name":"sles11_sp3-i386", "desc":"SLES 11 SP3 i586", "path":"/vagrant/distros/sles11_sp3_i586"},
++ {"name":"sles11_sp3-x86_64", "desc":"SLES 11 SP3 x86_64", "path":"/vagrant/distros/sles11_sp3_x86_64"},
++ {"name":"sles11_sp3-ppc64", "desc":"SLES 11 SP3 ppc64", "path":"/vagrant/distros/sles11_sp3_ppc64"},
+ ]
+ 
+ for i in range(0,len(distros)):

Index: users_patch.diff
===================================================================

--- users_patch.diff	(revision 54)
+++ users_patch.diff	(working copy)
@@ -1,32 +1,29 @@
-Index: cobbler/action_reposync.py
-===================================================================
---- cobbler/action_reposync.py.orig
-+++ cobbler/action_reposync.py
-@@ -560,7 +560,12 @@ class RepoSync:
-         a safeguard.
-         """
-         # all_path = os.path.join(repo_path, "*")
--        cmd1 = "chown -R root:apache %s" % repo_path
-+        owner = "root:apache"
-+        if os.path.exists("/etc/SuSE-release"):
-+            owner = "root:wwwrun"
-+
-+        cmd1 = "chown -R "+owner+" %s" % repo_path
-+
-         utils.subprocess_call(self.logger, cmd1)
- 
-         cmd2 = "chmod -R 755 %s" % repo_path
-Index: cobbler/cobblerd.py
-===================================================================
---- cobbler/cobblerd.py.orig
-+++ cobbler/cobblerd.py
-@@ -64,6 +64,8 @@
-         http_user = "apache"
-         if utils.check_dist() in [ "debian", "ubuntu" ]:
-             http_user = "www-data"
-+        elif utils.check_dist() == "suse":
-+            http_user = "wwwrun"
-         utils.os_system("chown %s /var/lib/cobbler/web.ss"%http_user )
-     else:
-         fd = os.open(ssfile,os.O_CREAT|os.O_RDWR,0600)
-
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/cobbler/action_reposync.py ./cobbler/action_reposync.py
+--- ../orig-cobbler-cobbler-2.4.0-1/cobbler/action_reposync.py	2013-06-20 07:42:48.000000000 +0200
++++ ./cobbler/action_reposync.py	2013-08-13 13:46:50.341464250 +0200
+@@ -585,7 +585,12 @@
+         a safeguard.
+         """
+         # all_path = os.path.join(repo_path, "*")
+-        cmd1 = "chown -R root:apache %s" % repo_path
++        owner = "root:apache"
++        if os.path.exists("/etc/SuSE-release"):
++            owner = "root:wwwrun"
++
++        cmd1 = "chown -R "+owner+" %s" % repo_path
++
+         utils.subprocess_call(self.logger, cmd1)
+ 
+         cmd2 = "chmod -R 755 %s" % repo_path
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/cobbler/cobblerd.py ./cobbler/cobblerd.py
+--- ../orig-cobbler-cobbler-2.4.0-1/cobbler/cobblerd.py	2013-06-20 07:42:48.000000000 +0200
++++ ./cobbler/cobblerd.py	2013-08-13 13:46:50.345464415 +0200
+@@ -64,6 +64,8 @@
+         http_user = "apache"
+         if utils.check_dist() in [ "debian", "ubuntu" ]:
+             http_user = "www-data"
++        elif utils.check_dist() == "suse":
++            http_user = "wwwrun"
+         utils.os_system("chown %s /var/lib/cobbler/web.ss"%http_user )
+     else:
+         fd = os.open(ssfile,os.O_CREAT|os.O_RDWR,0600)

• Files Changed
• Browse Source

rediff
--This line, and those below, will be ignored--

M    fix-initscript.dif
M    suse_config.diff

Diff for working copy: .
Index: fix-initscript.dif
===================================================================

--- fix-initscript.dif	(revision 53)
+++ fix-initscript.dif	(working copy)
@@ -1,5 +1,6 @@
---- config/cobblerd
-+++ config/cobblerd	2012/04/19 08:55:40
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/cobblerd ./config/cobblerd
+--- ../orig-cobbler-cobbler-2.4.0-1/config/cobblerd	2013-06-20 07:42:48.000000000 +0200
++++ ./config/cobblerd	2013-08-13 13:40:07.784665624 +0200
 @@ -7,8 +7,9 @@
  
  ### BEGIN INIT INFO
@@ -15,7 +16,7 @@
 @@ -50,8 +51,33 @@
  
  start() {
-     echo -n $"Starting cobbler daemon: "
+     echo -n "Starting cobbler daemon: "
 +    # Change the SECRET_KEY option in the Django settings.py file
 +    # required for security reasons, should be unique on all systems
 +    # the default is empty -> SECRET_KEY = ''
@@ -60,9 +61,8 @@
      RETVAL=$?
      echo
      if [ $RETVAL -eq 0 ]; then
--    rm -f $LOCKFILE
 +        if [ -f $DEBIAN_VERSION ]; then
-+            rm -f $LOCKFILE
+     rm -f $LOCKFILE
 +        fi
          rm -f /var/run/$SERVICE.pid
      fi

Index: suse_config.diff
===================================================================

--- suse_config.diff	(revision 53)
+++ suse_config.diff	(working copy)
@@ -1,49 +1,47 @@
-Index: config/cobbler.conf
-===================================================================
---- config/cobbler.conf.orig
-+++ config/cobbler.conf
-@@ -1,15 +1,15 @@
- # 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"
--Alias /cobbler /var/www/cobbler
--Alias /cobbler_webui_content /var/www/cobbler_webui_content
-+AliasMatch ^/cblr(?!/svc/)(.*)?$ "/srv/www/cobbler$1"
-+AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
-+#AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
-+Alias /cobbler /srv/www/cobbler
-+Alias /cobbler_webui_content /srv/www/cobbler_webui_content
- 
--WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py
-+WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.py
- 
--<Directory "/var/www/cobbler">
-+<Directory "/srv/www/cobbler">
-     Options Indexes FollowSymLinks
-     Order allow,deny
-     Allow from all
-@@ -26,7 +26,7 @@ BrowserMatch "MSIE" AuthDigestEnableQuer
- # 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
-Index: config/settings
-===================================================================
---- config/settings.orig
-+++ config/settings
-@@ -401,7 +401,7 @@ virt_auto_boot: 1
- # 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
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/cobbler.conf ./config/cobbler.conf
+--- ../orig-cobbler-cobbler-2.4.0-1/config/cobbler.conf	2013-06-20 07:42:48.000000000 +0200
++++ ./config/cobbler.conf	2013-08-13 13:48:05.288587476 +0200
+@@ -1,15 +1,15 @@
+ # 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"
+-Alias /cobbler /var/www/cobbler
+-Alias /cobbler_webui_content /var/www/cobbler_webui_content
++AliasMatch ^/cblr(?!/svc/)(.*)?$ "/srv/www/cobbler$1"
++AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
++#AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
++Alias /cobbler /srv/www/cobbler
++Alias /cobbler_webui_content /srv/www/cobbler_webui_content
+ 
+-WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py
++WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.py
+ 
+-<Directory "/var/www/cobbler">
++<Directory "/srv/www/cobbler">
+     Options Indexes FollowSymLinks
+     Order allow,deny
+     Allow from all
+@@ -26,7 +26,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
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/settings ./config/settings
+--- ../orig-cobbler-cobbler-2.4.0-1/config/settings	2013-06-20 07:42:48.000000000 +0200
++++ ./config/settings	2013-08-13 13:48:05.288587476 +0200
+@@ -412,7 +412,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

• Files Changed
• Browse Source