Permalink
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@1198 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
alobbs committed Mar 4, 2008
1 parent be14acc commit 9fafef74133314bb1a839cac3e283729321b9c0d
Showing with 10 additions and 5 deletions.
  1. +3 −0 ChangeLog
  2. +1 −1 Makefile.am
  3. +1 −1 admin/Makefile.am
  4. +2 −0 admin/configured.py.pre
  5. +3 −3 cherokee.conf.sample.pre
View
@@ -1,5 +1,8 @@
2008-03-04 Alvaro Lopez Ortega <alvaro@alobbs.com>
+ * Makefile.am, cherokee.conf.sample.pre, admin/Makefile.am,
+ admin/configured.py.pre: Replaced /var by %localstatedir%.
+
* contrib/spawn-fcgi.c: Added wait.h header. Fixes compilation on
Solaris 10.
View
@@ -24,7 +24,7 @@ cherokeeconfdir = $(sysconfdir)/cherokee
cherokeeadmindir = $(datadir)/cherokee/admin
.sample.pre.sample:
- sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
CONFS_PRE = \
cherokee.conf.sample.pre \
View
@@ -5,7 +5,7 @@ SUBDIRS = static
SUFFIXES = .py.pre .py
.py.pre.py:
- sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
PY_PRE = \
configured.py.pre
View
@@ -4,9 +4,11 @@ PREFIX = "%prefix%"
DATADIR = "%datadir%"
WWWROOT = "%wwwroot%"
SYSCONFDIR = "%sysconfdir%"
+LOCALSTATE = "%localstatedir%"
VERSION = "%version%"
CHEROKEE_SRV_PATH = join (PREFIX, "sbin/cherokee")
+CHEROKEE_GUARDIAN = join (PREFIX, "sbin/cherokee-guardian")
CHEROKEE_ADMINDIR = join (PREFIX, "share/cherokee/admin")
CHEROKEE_ICONSDIR = join (PREFIX, "share/cherokee/icons")
CHEROKEE_THEMEDIR = join (PREFIX, "share/cherokee/themes")
View
@@ -13,10 +13,10 @@ server!port_tls = 443
server!timeout = 60
server!keepalive = 1
server!keepalive_max_requests = 500
-server!pid_file = /var/run/cherokee.pid
server!server_tokens = full
server!encoder!gzip!allow = html,html,txt,css,js
server!panic_action = %prefix%/bin/cherokee-panic
+server!pid_file = %localstatedir%/run/cherokee.pid
server!mime_files = %sysconfdir%/cherokee/mime.types
# Default virtual server
@@ -26,10 +26,10 @@ vserver!default!directory_index = index.php,index.html
vserver!default!logger = combined
vserver!default!logger!access!type = file
-vserver!default!logger!access!filename = /var/log/cherokee.access
+vserver!default!logger!access!filename = %localstatedir%/log/cherokee.access
vserver!default!logger!access!buffsize = 16384
vserver!default!logger!error!type = file
-vserver!default!logger!error!filename = /var/log/cherokee.error
+vserver!default!logger!error!filename = %localstatedir%/log/cherokee.error
vserver!default!directory!/!handler = common
vserver!default!directory!/!handler!iocache = 0

0 comments on commit 9fafef7

Please sign in to comment.