--- doc/config/conf.d/auth.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/auth.conf 2010-10-17 05:20:42.000000000 -0500
@@ -8,8 +8,8 @@
##
#auth.backend = "plain"
-#auth.backend.plain.userfile = "/etc/lighttpd/lighttpd.user"
-#auth.backend.plain.groupfile = "/etc/lighttpd/lighttpd.group"
+#auth.backend.plain.userfile = conf_dir + "/lighttpd.user"
+#auth.backend.plain.groupfile = conf_dir + "/lighttpd.group"
#auth.backend.ldap.hostname = "localhost"
#auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
--- doc/config/conf.d/cgi.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/cgi.conf 2010-10-17 05:19:33.000000000 -0500
@@ -12,11 +12,11 @@
##
## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini.
##
-cgi.assign = ( ".pl" => "/usr/bin/perl",
- ".cgi" => "/usr/bin/perl",
- ".rb" => "/usr/bin/ruby",
- ".erb" => "/usr/bin/eruby",
- ".py" => "/usr/bin/python" )
+cgi.assign = ( ".pl" => "@PREFIX@/bin/perl",
+ ".cgi" => "@PREFIX@/bin/perl",
+ ".rb" => "@PREFIX@/bin/ruby",
+ ".erb" => "@PREFIX@/bin/eruby",
+ ".py" => "@PREFIX@/bin/python2.6" )
##
## to get the old cgi-bin behavior of apache
--- doc/config/conf.d/fastcgi.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/fastcgi.conf 2010-10-17 05:03:24.000000000 -0500
@@ -23,7 +23,7 @@
# ( "php-local" =>
# (
# "socket" => socket_dir + "/php-fastcgi-1.socket",
-# "bin-path" => server_root + "/cgi-bin/php5",
+# "bin-path" => "@PREFIX@/bin/php-cgi",
# "max-procs" => 1,
# "broken-scriptfilename" => "enable",
# )
@@ -40,7 +40,7 @@
# ( "php-num-procs" =>
# (
# "socket" => socket_dir + "/php-fastcgi-2.socket",
-# "bin-path" => server_root + "/cgi-bin/php5",
+# "bin-path" => "@PREFIX@/bin/php",
# "bin-environment" => (
# "PHP_FCGI_CHILDREN" => "16",
# "PHP_FCGI_MAX_REQUESTS" => "10000",
@@ -115,7 +115,7 @@
## chrooted webserver + external PHP
##
-## $ spawn-fcgi -f /usr/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
+## $ spawn-fcgi -f @PREFIX@/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
##
## webserver chrooted to /srv/www/
## php running outside the chroot
@@ -128,7 +128,7 @@
# )))
#
#server.chroot = "/srv/www"
-#server.document-root = "/servers/wwww.example.org/htdocs/"
+#server.document-root = "/servers/www.example.org/htdocs/"
#
##
--- doc/config/conf.d/mysql_vhost.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/mysql_vhost.conf 2010-10-17 05:14:56.000000000 -0500
@@ -12,7 +12,7 @@
##
## Local path to the mysql socket
##
-#mysql-vhost.sock = "/var/lib/mysql/mysql.sock"
+mysql-vhost.sock = "@PREFIX@/var/run/mysql5/mysqld.sock"
##
## Host of the MySQL server.
--- doc/config/conf.d/rrdtool.conf.orig 2010-07-11 12:01:32.000000000 -0500
+++ doc/config/conf.d/rrdtool.conf 2010-10-17 05:07:35.000000000 -0500
@@ -10,12 +10,12 @@
##
## Path to the rrdtool binary.
##
-rrdtool.binary = "/usr/bin/rrdtool"
+rrdtool.binary = "@PREFIX@/bin/rrdtool"
##
## Path to the rrdtool database. You can override this in conditionals.
##
-rrdtool.db-name = "/var/lib/lighttpd/lighttpd.rrd"
+rrdtool.db-name = home_dir + "/lighttpd.rrd"
##
#######################################################################
--- doc/config/lighttpd.conf.orig 2011-12-18 06:57:25.000000000 -0600
+++ doc/config/lighttpd.conf 2011-12-19 02:03:13.000000000 -0600
@@ -13,11 +13,11 @@
## if you add a variable here. Add the corresponding variable in the
## chroot example aswell.
##
-var.log_root = "/var/log/lighttpd"
-var.server_root = "/srv/www"
-var.state_dir = "/var/run"
-var.home_dir = "/var/lib/lighttpd"
-var.conf_dir = "/etc/lighttpd"
+var.log_root = "@PREFIX@/var/log/lighttpd"
+var.server_root = "@PREFIX@/www"
+var.state_dir = "@PREFIX@/var/run/lighttpd"
+var.home_dir = "@PREFIX@/var/lib/lighttpd"
+var.conf_dir = "@PREFIX@/etc/lighttpd"
##
## run the server chrooted.
@@ -58,7 +58,7 @@
## used in:
## conf.d/compress.conf
##
-var.cache_dir = "/var/cache/lighttpd"
+var.cache_dir = "@PREFIX@/var/cache/lighttpd"
##
## Base directory for sockets.
@@ -345,7 +345,7 @@
## Format: <errorfile-prefix><status-code>.html
## -> ..../status-404.html for 'File not found'
##
-#server.errorfile-prefix = "/srv/www/htdocs/errors/status-"
+#server.errorfile-prefix = server.document-root + /errors/status-"
##
## mimetype mapping
@@ -393,7 +393,7 @@
##
## $SERVER["socket"] == "10.0.0.1:443" {
## ssl.engine = "enable"
-## ssl.pemfile = "/etc/ssl/private/www.example.com.pem"
+## ssl.pemfile = "@PREFIX@/etc/ssl/private/www.example.com.pem"
## #
## # Mitigate BEAST attack:
## #
@@ -415,16 +415,16 @@
## #
## server.name = "www.example.com"
##
-## server.document-root = "/srv/www/vhosts/example.com/www/"
+## server.document-root = "@PREFIX@/www/vhosts/example.com/www/"
## }
##
## If you have a .crt and a .key file, cat them together into a
## single PEM file:
-## $ cat /etc/ssl/private/lighttpd.key /etc/ssl/certs/lighttpd.crt \
-## > /etc/ssl/private/lighttpd.pem
+## $ cat @PREFIX@/etc/ssl/private/lighttpd.key @PREFIX@/etc/ssl/certs/lighttpd.crt \
+## > @PREFIX@/etc/ssl/private/lighttpd.pem
##
-#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
+#ssl.pemfile = "@PREFIX@/etc/ssl/private/lighttpd.pem"
##
## optionally pass the CA certificate here.
@@ -440,6 +440,6 @@
## custom includes like vhosts.
##
#include "conf.d/config.conf"
-#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
+#include_shell "cat @PREFIX@/etc/lighttpd/vhosts.d/*.conf"
##
#######################################################################