Файлы cherokee-0.4.30.orig/ChangeLog.gz и cherokee-0.4.30/ChangeLog.gz различаются

diff -ruN cherokee-0.4.30.orig/cherokee.conf.sample.pre cherokee-0.4.30/cherokee.conf.sample.pre

--- cherokee-0.4.30.orig/cherokee.conf.sample.pre	2006-01-13 23:10:31 +0300

+++ cherokee-0.4.30/cherokee.conf.sample.pre	2006-03-15 02:48:12 +0300

@@ -13,7 +13,7 @@

 ##

 ## PortTLS: The port to which the secure server listens. Default 443.

 ##

-# PortTLS 443

+PortTLS 443

 ##

 ## IPv6 support

@@ -23,7 +23,7 @@

 ##

 ## This directiveis used to tell the server which IP address to listen to.

 ##

-#Listen 127.0.0.1

+Listen 127.0.0.1

 ##

 ## If you wish cherokee to run as a different user or group, you must run

@@ -35,8 +35,10 @@

 ## Eg: User 65534

 ##     Group 65534

 ##

-#User nobody

-#Group nogroup

+## Warning! Unprevilegged user can not bind to ports < 1024.

+## So reloading server (with -SIGHUP) will not work.

+#User @cherokee_user@

+#Group @cherokee_group@

 ##

 ## Chroot:

@@ -80,7 +82,7 @@

 ## PidFile: The file in which the server should record its process

 ## identification number when it starts.

 ##

-PidFile /var/run/cherokee.pid

+PidFile /var/run/cherokee/cherokee.pid

 ##

 ## Icons: Extension to icon file.

diff -ruN cherokee-0.4.30.orig/mods-ssl.sample.pre cherokee-0.4.30/mods-ssl.sample.pre

--- cherokee-0.4.30.orig/mods-ssl.sample.pre	2005-09-19 20:44:21 +0400

+++ cherokee-0.4.30/mods-ssl.sample.pre	2006-03-15 02:47:56 +0300

@@ -2,17 +2,17 @@

 ## SSLCertificateFile:

 ## This is your PEM-encoded server certificate

 ##

-SSLCertificateFile %sysconfdir%/cherokee/ssl/cherokee.pem

+SSLCertificateFile /var/lib/ssl/certs/cherokee.pem

 ##

 ## SSLCertificateKeyFile: 

 ## This is the private key of your certificate, PEM-encoded.

 ##

-SSLCertificateKeyFile %sysconfdir%/cherokee/ssl/cherokee.pem

+SSLCertificateKeyFile /var/lib/ssl/certs/cherokee.pem

 ##

 ## SSLCAListFile:

 ## This is a file containing all certification authorities that you trust.

 ## Tip: you can just use the file cert.pem

 ##

-SSLCAListFile %sysconfdir%/cherokee/ssl/cherokee.pem

+SSLCAListFile /var/lib/ssl/certs/cherokee.pem

diff -ruN cherokee-0.4.30.orig/sites-default.sample.pre cherokee-0.4.30/sites-default.sample.pre

--- cherokee-0.4.30.orig/sites-default.sample.pre	2005-11-03 19:26:20 +0300

+++ cherokee-0.4.30/sites-default.sample.pre	2006-03-15 02:47:56 +0300

@@ -9,7 +9,7 @@

 ## documents. By default, all requests are taken from this directory, but

 ## symbolic links and aliases may be used to point to other locations.

 ##

-DocumentRoot %wwwroot%

+DocumentRoot %wwwroot%/html

 ##

 ## UserDir: Use this to enable users of the server running your website 

@@ -29,7 +29,7 @@

     Directory /cgi-bin/ {

 	   Handler cgi

-	   DocumentRoot /usr/lib/cgi-bin/

+	   DocumentRoot %wwwroot%/cgi-bin/

     }

 }

@@ -43,8 +43,8 @@

 ## w3c      - LogFile

 ##

 Log combined {

-    AccessLog /var/log/cherokee.access

-    ErrorLog  /var/log/cherokee.error

+    AccessLog /var/log/cherokee/access.log

+    ErrorLog  /var/log/cherokee/error.log

 }

 #Log w3c {

@@ -88,7 +88,7 @@

 Directory /cgi-bin {

 		Handler cgi

-		DocumentRoot %prefix%/lib/cgi-bin/

+		DocumentRoot %wwwroot%/cgi-bin/

 }

 # Directory /google {

@@ -196,3 +196,6 @@

 Extension php, php3, php4 {

 		Handler phpcgi

 }

+

+#Include /etc/cherokee/addon.d/A.trac.cgi.conf

+#Include /etc/cherokee/addon.d/A.trac.fcgi.conf

diff -ruN cherokee-0.4.30.orig/sites-example.sample.pre cherokee-0.4.30/sites-example.sample.pre

--- cherokee-0.4.30.orig/sites-example.sample.pre	2005-09-19 20:44:21 +0400

+++ cherokee-0.4.30/sites-example.sample.pre	2006-03-15 02:47:56 +0300

@@ -2,7 +2,7 @@

 ## Virtual server for example.com

 ##

 Server example.com, www.example.com {

-	  DocumentRoot /tmp

+	  DocumentRoot /var/www/vhosts/example.com/html

 	  Directory / {

 			  Handler common