Attachment #111123 for bug #152339

Lines 6-12 Link Here

(-)cherokee-new/Makefile (-17 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 1.0.8	9	PORTVERSION= 1.0.9
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \	11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \	12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
Lines 64-71 Link Here
64	CHEROKEE_ERRORLOG?= ${CHEROKEE_LOGDIR}/cherokee.error	64	CHEROKEE_ERRORLOG?= ${CHEROKEE_LOGDIR}/cherokee.error
65		65
66	# Adjust this if you need to run Cherokee as a distinct user:group	66	# Adjust this if you need to run Cherokee as a distinct user:group
67	CHEROKEE_USER= www	67	CHEROKEE_USER= www
68	CHEROKEE_GROUP= www	68	CHEROKEE_GROUP= www
		69
		70	# This should be ok since 1.0.9, cherokee drops privileges
		71	# after opening logfiles as a security measure
		72	CHEROKEE_LOGFILE_FILEMODE=0600
		73	CHEROKEE_LOGFILE_USER= root
		74	CHEROKEE_LOGFILE_GROUP= wheel
69		75
70	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \	76	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \
71	--localstatedir=${CHEROKEE_VARDIR} \	77	--localstatedir=${CHEROKEE_VARDIR} \
Lines 174-205 Link Here
174	s:%prefix%:${PREFIX}:g; \	180	s:%prefix%:${PREFIX}:g; \
175	s:%localstatedir%:/var:g' \	181	s:%localstatedir%:/var:g' \
176	$$i > $${i%.pre};done	182	$$i > $${i%.pre};done
		183
177	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	184	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
178	${WRKSRC}/admin/server.py	185	${WRKSRC}/admin/server.py
179	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	186	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
180	${WRKSRC}/contrib/05to06.py	187	${WRKSRC}/admin/upgrade_config.py
181	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
182	${WRKSRC}/contrib/06to07.py
183	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	188	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
184	${WRKSRC}/contrib/07to08.py	189	${WRKSRC}/cherokee/cherokee-tweak
185	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	190	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
186	${WRKSRC}/contrib/08to09.py	191	${WRKSRC}/doc/cookbook_dbslayer.html
187	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
188	${WRKSRC}/contrib/09to010.py
189	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	192	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
190	${WRKSRC}/contrib/011to098.py	193	${WRKSRC}/doc/test_images.py
191	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	194	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
192	${WRKSRC}/contrib/098to099.py	195	${WRKSRC}/contrib/tracelor.py
193	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	196	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
194	${WRKSRC}/contrib/0999to09910.py	197	${WRKSRC}/gitlog2changelog.py
195	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	198	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
196	${WRKSRC}/contrib/tracelor.py	199	${WRKSRC}/po/po_stats.py
197	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	200	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
198	${WRKSRC}/doc/cookbook_dbslayer.html	201	${WRKSRC}/packages/osx/build.py
199	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	202	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
200	${WRKSRC}/qa/fcgi.py	203	${WRKSRC}/qa/fcgi.py
201	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \	204	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
202	${WRKSRC}/qa/run-tests.py	205	${WRKSRC}/qa/run-tests.py
		206	@${REINPLACE_CMD} -e 's\|/usr/bin/env python\|/usr/local/bin/python\|' \
		207	${WRKSRC}/svnlog2changelog.py
		208
203		209
204	post-install:	210	post-install:
205	@${INSTALL} -d ${CONFSUBDIRS:S\|^\|${PREFIX}/etc/cherokee/\|}	211	@${INSTALL} -d ${CONFSUBDIRS:S\|^\|${PREFIX}/etc/cherokee/\|}
Lines 225-232 Link Here
225	.endif	231	.endif
226		232
227	@${SETENV} \	233	@${SETENV} \
228	CHEROKEE_USER=${CHEROKEE_USER} \	234	CHEROKEE_LOGFILE_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE} \
229	CHEROKEE_GROUP=${CHEROKEE_GROUP} \	235	CHEROKEE_LOGFILE_USER=${CHEROKEE_LOGFILE_USER} \
		236	CHEROKEE_LOGFILE_GROUP=${CHEROKEE_LOGFILE_GROUP} \
230	CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \	237	CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \
231	CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \	238	CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \
232	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	239	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

Lines 1-3 Link Here

(-)cherokee-new/distinfo (-3 / +2 lines)
1	MD5 (cherokee-1.0.8.tar.gz) = 12117a80c2a970173bd32660439c2db0	1	SHA256 (cherokee-1.0.9.tar.gz) = ab637e411717a57545f374e0c44b1e1ecb421e0a57a70f5fb456029631c4db46
2	SHA256 (cherokee-1.0.8.tar.gz) = 45e0f777668f7e1ea13c706bdd7b6519077854a69223ad5d3b2fa30bdc83cf1f	2	SIZE (cherokee-1.0.9.tar.gz) = 5784929
3	SIZE (cherokee-1.0.8.tar.gz) = 5384416

Line 0 Link Here

(-)cherokee-new/files/patch-cherokee-admin-market-Package.py (+9 lines)
	1	--- admin/market/Package.py-orig 2010-11-15 18:14:42.000000000 -0300
	2	+++ admin/market/Package.py 2010-11-15 18:14:57.000000000 -0300
	3	@@ -30,5 +30,5 @@
	4	self.status_setup = CTK.ImageStock('loading')
	5
	6	table = CTK.Table()
	7	- table += [CTK.RawHTML ("Uncompress"),
	8	+ table += [CTK.RawHTML ("Uncompress"),]
	9




--- admin/SystemStats.py-orig	2010-11-03 13:54:15.000000000 -0300
+++ admin/SystemStats.py	2010-11-17 16:55:53.000000000 -0300
@@ -42,6 +42,9 @@
             _stats = System_stats__Linux()
         elif sys.platform == 'darwin':
             _stats = System_stats__Darwin()
+        elif sys.platform.rstrip('987') == 'freebsd' :
+            _stats = System_stats__FreeBSD()
+        
 
     assert _stats, "Not implemented"
     return _stats
@@ -286,6 +289,130 @@
             time.sleep (self.CHECK_INTERVAL)
 
 
+
+# FreeBSD implementation	
+class System_stats__FreeBSD (Thread, System_stats):
+    CHECK_INTERVAL = 2
+
+    def __init__ (self):
+        Thread.__init__ (self)
+        System_stats.__init__ (self)
+
+        self.cpu._user_prev = 0
+        self.cpu._sys_prev  = 0
+        self.cpu._nice_prev = 0
+        self.cpu._idle_prev = 0
+
+        # Read valid values
+        self._read_hostname()
+        self._read_cpu()
+        self._read_memory()
+        self._read_cpu_info()
+
+        self.start()
+
+    def _read_hostname (self):
+        import os
+
+	hname = os.uname()[1]
+
+	if not hname:
+          # Execute sysctl 
+          fd = subprocess.Popen ("/sbin/sysctl -n kern.hostname", shell=True, stdout = subprocess.PIPE)
+          hname = fd.stdout.readline().strip()
+
+        self.hostname=hname
+
+    def _read_cpu_info (self):
+	    
+	fd = subprocess.Popen("/sbin/sysctl hw.ncpu  hw.clockrate  kern.threads.virtual_cpu", shell=True, stdout =subprocess.PIPE)    
+        lines = fd.stdout.readlines()
+     
+
+        ncpus=0
+        vcpus=0 
+	clock=''
+
+	for line in lines:
+	    parts = line.split()
+	    if parts[0] == 'hw.ncpu:':
+		ncpus = int(parts[1])
+            elif parts[0] == 'hw.clockrate:':
+		clock = parts[1] 
+            elif parts[0] == 'kern.threads.virtual_cpu:':
+		vcpus = parts[1] 
+
+
+	# FIXME: Is this reliable?
+	self.cpu.num=str(int(vcpus)/int(ncpus))
+ 	self.cpu.cores=vcpus
+        
+	self.cpu.speed = '%s MHz' %(clock)
+
+    def _read_cpu (self):
+	fd = subprocess.Popen("/sbin/sysctl -n kern.cp_time", shell=True, stdout =subprocess.PIPE)    
+        
+	fields = fd.stdout.readline().split()
+
+        user = float(fields[0])
+        sys  = float(fields[1])
+        nice = float(fields[2])
+#	intr = float(fields[3]) # 4th is interrupts, not used
+        idle = float(fields[4])
+
+        total = ((user - self.cpu._user_prev) + (sys - self.cpu._sys_prev) + (nice - self.cpu._nice_prev) + (idle - self.cpu._idle_prev))
+        self.cpu.usage = int(100.0 * ((user + sys + nice) - (self.cpu._user_prev + self.cpu._sys_prev + self.cpu._nice_prev)) / (total + 0.001) + 0.5)
+
+        if (self.cpu.usage > 100):
+            self.cpu.usage = 100
+
+        self.cpu.idle = 100 - self.cpu.usage
+
+        self.cpu._user_prev = user
+        self.cpu._sys_prev  = sys
+        self.cpu._nice_prev = nice
+        self.cpu._idle_prev = idle
+
+    def _read_memory (self):
+
+	# What we need from sysctl:
+	#  * vm.stats.vm.v_free_count
+        #  * vm.stats.vm.v_page_count
+        #  * hw.pagesize
+
+        # physical memory free = v_free_count*page_size;
+        # physical memory size = v_page_count*page_size;
+        # physical memory used = size - free space
+
+	fd = subprocess.Popen("/sbin/sysctl vm.stats.vm.v_free_count vm.stats.vm.v_page_count hw.pagesize", shell=True, stdout =subprocess.PIPE)    
+	lines = fd.stdout.readlines()
+
+        pagesize  = 0
+        pagecount = 0
+        freecount = 0
+
+	for line in lines:
+	    parts = line.split()
+	    if   parts[0] == 'hw.pagesize:':
+               pagesize = int(parts[1])
+            elif parts[0] == 'vm.stats.vm.v_free_count:':   
+               freecount = int(parts[1])
+            elif parts[0] == 'vm.stats.vm.v_page_count:':   
+	       pagecount = int(parts[1])
+
+
+        self.mem.total = (pagesize * pagecount) / 1024
+        self.mem.free  = (pagesize * freecount) / 1024
+        self.mem.used  = (pagesize * (pagecount-freecount)) / 1024
+
+
+    def run (self):
+        while True:
+            self._read_cpu()
+            self._read_memory()
+            time.sleep (self.CHECK_INTERVAL)
+
+
 if __name__ == '__main__':
     sys_stats = get_system_stats()
 
@@ -305,3 +432,5 @@
         print 'free',  sys_stats.mem.free
 
         time.sleep(1)
+
+




--- cherokee/main_admin.c-orig	2010-10-29 07:11:18.000000000 -0300
+++ cherokee/main_admin.c	2010-11-15 16:56:39.000000000 -0300
@@ -35,6 +35,10 @@
 #include "server-protected.h"
 #include "util.h"
 
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
 #ifdef HAVE_GETOPT_LONG
 # include <getopt.h>
 #else




--- cherokee/util.c-orig	2010-11-15 17:53:34.000000000 -0300
+++ cherokee/util.c	2010-11-15 17:56:46.000000000 -0300
@@ -38,6 +38,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
+ 
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #else





PATH=/bin:/usr/bin:/usr/sbin

FILEMODE=0640

C_ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}
C_ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}
C_USER=${CHEROKEE_LOGFILE_USER:-root}
C_GROUP=${CHEROKEE_LOGFILE_GROUP:-wheel}
C_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE:-0640}

case $2 in

POST-INSTALL)
        echo "$2 for $1" 
	echo "Adjusting ownership (${C_USER}:${C_GROUP}) and permissions (${C_FILEMODE}) on log files:"
        echo "${C_ACCESSLOG}"
        echo "${C_ERRORLOG}"


        fi

	chown ${C_USER}:${C_GROUP} ${C_ACCESSLOG} ${C_ERRORLOG}
	chmod ${C_FILEMODE} ${C_ACCESSLOG} ${C_ERRORLOG}
	
	;;


Lines 10-16 Link Here

(-)cherokee-new/pkg-plist (-30 / +107 lines)
10	etc/cherokee/sites-available/.empty	10	etc/cherokee/sites-available/.empty
11	etc/cherokee/sites-enabled/.empty	11	etc/cherokee/sites-enabled/.empty
12	etc/cherokee/ssl/.empty	12	etc/cherokee/ssl/.empty
13	include/cherokee/admin_client.h
14	include/cherokee/avl.h	13	include/cherokee/avl.h
15	include/cherokee/avl_r.h	14	include/cherokee/avl_r.h
16	include/cherokee/buffer.h	15	include/cherokee/buffer.h
Lines 69-76 Link Here
69	lib/cherokee/libplugin_custom.so	68	lib/cherokee/libplugin_custom.so
70	lib/cherokee/libplugin_custom_error.la	69	lib/cherokee/libplugin_custom_error.la
71	lib/cherokee/libplugin_custom_error.so	70	lib/cherokee/libplugin_custom_error.so
72	lib/cherokee/libplugin_tls.la
73	lib/cherokee/libplugin_tls.so
74	%%MYSQL%%lib/cherokee/libplugin_dbslayer.la	71	%%MYSQL%%lib/cherokee/libplugin_dbslayer.la
75	%%MYSQL%%lib/cherokee/libplugin_dbslayer.so	72	%%MYSQL%%lib/cherokee/libplugin_dbslayer.so
76	lib/cherokee/libplugin_deflate.la	73	lib/cherokee/libplugin_deflate.la
Lines 85-96 Link Here
85	lib/cherokee/libplugin_error_nn.so	82	lib/cherokee/libplugin_error_nn.so
86	lib/cherokee/libplugin_error_redir.la	83	lib/cherokee/libplugin_error_redir.la
87	lib/cherokee/libplugin_error_redir.so	84	lib/cherokee/libplugin_error_redir.so
		85	lib/cherokee/libplugin_evhost.la
		86	lib/cherokee/libplugin_evhost.so
88	lib/cherokee/libplugin_exists.la	87	lib/cherokee/libplugin_exists.la
89	lib/cherokee/libplugin_exists.so	88	lib/cherokee/libplugin_exists.so
90	lib/cherokee/libplugin_extensions.la	89	lib/cherokee/libplugin_extensions.la
91	lib/cherokee/libplugin_extensions.so	90	lib/cherokee/libplugin_extensions.so
92	lib/cherokee/libplugin_evhost.la
93	lib/cherokee/libplugin_evhost.so
94	lib/cherokee/libplugin_fcgi.la	91	lib/cherokee/libplugin_fcgi.la
95	lib/cherokee/libplugin_fcgi.so	92	lib/cherokee/libplugin_fcgi.so
96	lib/cherokee/libplugin_file.la	93	lib/cherokee/libplugin_file.la
Lines 129-152 Link Here
129	lib/cherokee/libplugin_pam.so	126	lib/cherokee/libplugin_pam.so
130	lib/cherokee/libplugin_plain.la	127	lib/cherokee/libplugin_plain.la
131	lib/cherokee/libplugin_plain.so	128	lib/cherokee/libplugin_plain.so
		129	lib/cherokee/libplugin_post_report.la
		130	lib/cherokee/libplugin_post_report.so
		131	lib/cherokee/libplugin_post_track.la
		132	lib/cherokee/libplugin_post_track.so
132	lib/cherokee/libplugin_proxy.la	133	lib/cherokee/libplugin_proxy.la
133	lib/cherokee/libplugin_proxy.so	134	lib/cherokee/libplugin_proxy.so
134	lib/cherokee/libplugin_post_track.so
135	lib/cherokee/libplugin_post_track.la
136	lib/cherokee/libplugin_post_report.so
137	lib/cherokee/libplugin_post_report.la
138	lib/cherokee/libplugin_redir.la	135	lib/cherokee/libplugin_redir.la
139	lib/cherokee/libplugin_redir.so	136	lib/cherokee/libplugin_redir.so
140	lib/cherokee/libplugin_rehost.la	137	lib/cherokee/libplugin_rehost.la
141	lib/cherokee/libplugin_rehost.so	138	lib/cherokee/libplugin_rehost.so
142	lib/cherokee/libplugin_render_rrd.so
143	lib/cherokee/libplugin_render_rrd.la	139	lib/cherokee/libplugin_render_rrd.la
		140	lib/cherokee/libplugin_render_rrd.so
144	lib/cherokee/libplugin_request.la	141	lib/cherokee/libplugin_request.la
145	lib/cherokee/libplugin_request.so	142	lib/cherokee/libplugin_request.so
146	lib/cherokee/libplugin_round_robin.la	143	lib/cherokee/libplugin_round_robin.la
147	lib/cherokee/libplugin_round_robin.so	144	lib/cherokee/libplugin_round_robin.so
148	lib/cherokee/libplugin_rrd.so
149	lib/cherokee/libplugin_rrd.la	145	lib/cherokee/libplugin_rrd.la
		146	lib/cherokee/libplugin_rrd.so
150	lib/cherokee/libplugin_scgi.la	147	lib/cherokee/libplugin_scgi.la
151	lib/cherokee/libplugin_scgi.so	148	lib/cherokee/libplugin_scgi.so
152	lib/cherokee/libplugin_secdownload.la	149	lib/cherokee/libplugin_secdownload.la
Lines 155-168 Link Here
155	lib/cherokee/libplugin_server_info.so	152	lib/cherokee/libplugin_server_info.so
156	lib/cherokee/libplugin_ssi.la	153	lib/cherokee/libplugin_ssi.la
157	lib/cherokee/libplugin_ssi.so	154	lib/cherokee/libplugin_ssi.so
158	lib/cherokee/libplugin_streaming.la
159	lib/cherokee/libplugin_streaming.so
160	lib/cherokee/libplugin_target_ip.so
161	lib/cherokee/libplugin_target_ip.la	155	lib/cherokee/libplugin_target_ip.la
		156	lib/cherokee/libplugin_target_ip.so
		157	lib/cherokee/libplugin_tls.la
		158	lib/cherokee/libplugin_tls.so
162	lib/cherokee/libplugin_url_arg.la	159	lib/cherokee/libplugin_url_arg.la
163	lib/cherokee/libplugin_url_arg.so	160	lib/cherokee/libplugin_url_arg.so
164	lib/cherokee/libplugin_uwsgi.so
165	lib/cherokee/libplugin_uwsgi.la	161	lib/cherokee/libplugin_uwsgi.la
		162	lib/cherokee/libplugin_uwsgi.so
		163	lib/cherokee/libplugin_v_or.la
		164	lib/cherokee/libplugin_v_or.so
166	lib/cherokee/libplugin_wildcard.la	165	lib/cherokee/libplugin_wildcard.la
167	lib/cherokee/libplugin_wildcard.so	166	lib/cherokee/libplugin_wildcard.so
168	lib/libcherokee-base.la	167	lib/libcherokee-base.la
Lines 171-179 Link Here
171	lib/libcherokee-client.la	170	lib/libcherokee-client.la
172	lib/libcherokee-client.so	171	lib/libcherokee-client.so
173	lib/libcherokee-client.so.0	172	lib/libcherokee-client.so.0
174	lib/libcherokee-config.la
175	lib/libcherokee-config.so
176	lib/libcherokee-config.so.0
177	lib/libcherokee-server.la	173	lib/libcherokee-server.la
178	lib/libcherokee-server.so	174	lib/libcherokee-server.so
179	lib/libcherokee-server.so.0	175	lib/libcherokee-server.so.0
Lines 194-205 Link Here
194	%%NLS%%share/locale/sv_SE/LC_MESSAGES/cherokee.mo	190	%%NLS%%share/locale/sv_SE/LC_MESSAGES/cherokee.mo
195	%%ADMIN%%%%DATADIR%%/admin/Auth.py	191	%%ADMIN%%%%DATADIR%%/admin/Auth.py
196	%%ADMIN%%%%DATADIR%%/admin/Auth.pyc	192	%%ADMIN%%%%DATADIR%%/admin/Auth.pyc
197	%%ADMIN%%%%DATADIR%%/admin/Backup.py
198	%%ADMIN%%%%DATADIR%%/admin/Backup.pyc
199	%%ADMIN%%%%DATADIR%%/admin/Balancer.py	193	%%ADMIN%%%%DATADIR%%/admin/Balancer.py
200	%%ADMIN%%%%DATADIR%%/admin/Balancer.pyc	194	%%ADMIN%%%%DATADIR%%/admin/Balancer.pyc
201	%%ADMIN%%%%DATADIR%%/admin/Login.py
202	%%ADMIN%%%%DATADIR%%/admin/Login.pyc
203	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.py	195	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.py
204	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.pyc	196	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/AjaxUpload.pyc
205	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Box.py	197	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Box.py
Lines 298-320 Link Here
298	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/pyscgi.pyc	290	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/pyscgi.pyc
299	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.py	291	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.py
300	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.pyc	292	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/util.pyc
		293	%%ADMIN%%%%DATADIR%%/admin/market/__init__.py
		294	%%ADMIN%%%%DATADIR%%/admin/market/Install.py
		295	%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.py
		296	%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.py
		297	%%ADMIN%%%%DATADIR%%/admin/market/Menu.py
		298	%%ADMIN%%%%DATADIR%%/admin/market/Package.py
		299	%%ADMIN%%%%DATADIR%%/admin/market/PageApp.py
		300	%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.py
		301	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.py
		302	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.py
		303	%%ADMIN%%%%DATADIR%%/admin/market/Review.py
		304	%%ADMIN%%%%DATADIR%%/admin/market/Library.py
		305	%%ADMIN%%%%DATADIR%%/admin/market/Util.py
		306	%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.py
		307	%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.py
		308	%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.py
		309	%%ADMIN%%%%DATADIR%%/admin/market/__init__.pyc
		310	%%ADMIN%%%%DATADIR%%/admin/market/Install.pyc
		311	%%ADMIN%%%%DATADIR%%/admin/market/InstallUtil.pyc
		312	%%ADMIN%%%%DATADIR%%/admin/market/Install_Log.pyc
		313	%%ADMIN%%%%DATADIR%%/admin/market/Menu.pyc
		314	%%ADMIN%%%%DATADIR%%/admin/market/PageApp.pyc
		315	%%ADMIN%%%%DATADIR%%/admin/market/PageCategory.pyc
		316	%%ADMIN%%%%DATADIR%%/admin/market/PageIndex.pyc
		317	%%ADMIN%%%%DATADIR%%/admin/market/PageSearch.pyc
		318	%%ADMIN%%%%DATADIR%%/admin/market/Review.pyc
		319	%%ADMIN%%%%DATADIR%%/admin/market/Library.pyc
		320	%%ADMIN%%%%DATADIR%%/admin/market/Util.pyc
		321	%%ADMIN%%%%DATADIR%%/admin/market/Maintenance.pyc
		322	%%ADMIN%%%%DATADIR%%/admin/market/ows_consts.pyc
		323	%%ADMIN%%%%DATADIR%%/admin/market/CommandProgress.pyc
		324	%%ADMIN%%%%DATADIR%%/admin/market/Package.pyc
		325	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.py
		326	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.py
		327	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.py
		328	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.py
		329	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.py
		330	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Init.pyc
		331	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Paginator.pyc
		332	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/StarRating.pyc
		333	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Carousel.pyc
		334	%%ADMIN%%%%DATADIR%%/admin/CTK/CTK/Collapsible.pyc
		335	%%ADMIN%%%%DATADIR%%/admin/About.py
		336	%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.py
		337	%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.py
		338	%%ADMIN%%%%DATADIR%%/admin/OWS_Login.py
		339	%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.py
		340	%%ADMIN%%%%DATADIR%%/admin/SaveButton.py
		341	%%ADMIN%%%%DATADIR%%/admin/SystemInfo.py
		342	%%ADMIN%%%%DATADIR%%/admin/SystemStats.py
		343	%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.py
		344	%%ADMIN%%%%DATADIR%%/admin/popen.py
		345	%%ADMIN%%%%DATADIR%%/admin/About.pyc
		346	%%ADMIN%%%%DATADIR%%/admin/OWS_Backup.pyc
		347	%%ADMIN%%%%DATADIR%%/admin/OWS_Cherokee_Info.pyc
		348	%%ADMIN%%%%DATADIR%%/admin/OWS_Login.pyc
		349	%%ADMIN%%%%DATADIR%%/admin/OWS_Market_Info.pyc
		350	%%ADMIN%%%%DATADIR%%/admin/SaveButton.pyc
		351	%%ADMIN%%%%DATADIR%%/admin/SystemInfo.pyc
		352	%%ADMIN%%%%DATADIR%%/admin/SystemStats.pyc
		353	%%ADMIN%%%%DATADIR%%/admin/SystemStatsWidgets.pyc
		354	%%ADMIN%%%%DATADIR%%/admin/popen.pyc
301	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/CTK.css	355	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/CTK.css
302	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/datepicker.css	356	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/datepicker.css
303	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery-ui-1.7.2.custom.css	357	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery-ui-1.7.2.custom.css
304	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery.ibutton.css	358	%%ADMIN%%%%DATADIR%%/admin/CTK/static/css/jquery.ibutton.css
305	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/arrow_ns.png	359	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/arrow_ns.png
306	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-body.png
307	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-buttonpane.png	360	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-buttonpane.png
308	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar-close.gif	361	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar-close.gif
309	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar.png	362	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog-titlebar.png
310	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog.png	363	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-dialog.png
311	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-filter.png	364	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-filter.png
312	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-help-a.png
313	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-help-span.png
314	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions-sel.png	365	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions-sel.png
315	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions.png	366	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-sel-actions.png
316	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-td-even.png
317	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/bg-th.png
318	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del-hover.png	367	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del-hover.png
319	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del.png	368	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/del.png
320	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png	369	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/dialog-error.png
Lines 511-516 Link Here
511	%%ADMIN%%%%DATADIR%%/admin/static/images/advanced.png	560	%%ADMIN%%%%DATADIR%%/admin/static/images/advanced.png
512	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-bar.png	561	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-bar.png
513	%%ADMIN%%%%DATADIR%%/admin/static/images/cherokee-logo-bar.png	562	%%ADMIN%%%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
		563	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/jquery.ui.stars.gif
		564	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-left-arrow.png
		565	%%ADMIN%%%%DATADIR%%/admin/CTK/static/images/carousel-right-arrow.png
		566	%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/StarRating.js
		567	%%ADMIN%%%%DATADIR%%/admin/static/images/other/linkedin.png
		568	%%ADMIN%%%%DATADIR%%/admin/static/images/other/irc.png
		569	%%ADMIN%%%%DATADIR%%/admin/static/images/other/left.png
		570	%%ADMIN%%%%DATADIR%%/admin/static/images/other/right.png
		571	%%ADMIN%%%%DATADIR%%/admin/static/images/other/web.png
		572	%%ADMIN%%%%DATADIR%%/admin/static/images/backup.png
		573	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-body.png
		574	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-a.png
		575	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-help-span.png
		576	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-th.png
		577	%%ADMIN%%%%DATADIR%%/admin/static/images/bg-td-even.png
		578	%%ADMIN%%%%DATADIR%%/admin/static/images/cpu.png
		579	%%ADMIN%%%%DATADIR%%/admin/static/images/disk.png
		580	%%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-bg.png
		581	%%ADMIN%%%%DATADIR%%/admin/static/images/featured-list-selected.png
		582	%%ADMIN%%%%DATADIR%%/admin/static/images/host.png
		583	%%ADMIN%%%%DATADIR%%/admin/static/images/information.png
		584	%%ADMIN%%%%DATADIR%%/admin/static/images/market.png
		585	%%ADMIN%%%%DATADIR%%/admin/static/images/network.png
		586	%%ADMIN%%%%DATADIR%%/admin/static/images/panel-clone.png
		587	%%ADMIN%%%%DATADIR%%/admin/static/images/panel-new.png
		588	%%ADMIN%%%%DATADIR%%/admin/static/images/ram.png
		589	%%ADMIN%%%%DATADIR%%/admin/static/images/remote.png
		590	%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-bg.png
		591	%%ADMIN%%%%DATADIR%%/admin/static/images/sidebar-market.png
		592	%%ADMIN%%%%DATADIR%%/admin/static/images/uptime.png
514	%%ADMIN%%%%DATADIR%%/admin/static/images/favicon.ico	593	%%ADMIN%%%%DATADIR%%/admin/static/images/favicon.ico
515	%%ADMIN%%%%DATADIR%%/admin/static/images/flags/ad.png	594	%%ADMIN%%%%DATADIR%%/admin/static/images/flags/ad.png
516	%%ADMIN%%%%DATADIR%%/admin/static/images/flags/ae.png	595	%%ADMIN%%%%DATADIR%%/admin/static/images/flags/ae.png
Lines 761-773 Link Here
761	%%ADMIN%%%%DATADIR%%/admin/static/images/general.png	840	%%ADMIN%%%%DATADIR%%/admin/static/images/general.png
762	%%ADMIN%%%%DATADIR%%/admin/static/images/home.png	841	%%ADMIN%%%%DATADIR%%/admin/static/images/home.png
763	%%ADMIN%%%%DATADIR%%/admin/static/images/icons.png	842	%%ADMIN%%%%DATADIR%%/admin/static/images/icons.png
764	%%ADMIN%%%%DATADIR%%/admin/static/images/kid-running.png
765	%%ADMIN%%%%DATADIR%%/admin/static/images/kid-stopped.png
766	%%ADMIN%%%%DATADIR%%/admin/static/images/mime.png	843	%%ADMIN%%%%DATADIR%%/admin/static/images/mime.png
767	%%ADMIN%%%%DATADIR%%/admin/static/images/nav-selected.gif	844	%%ADMIN%%%%DATADIR%%/admin/static/images/nav-selected.gif
768	%%ADMIN%%%%DATADIR%%/admin/static/images/nav-sep.png	845	%%ADMIN%%%%DATADIR%%/admin/static/images/nav-sep.png
769	%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-bug.png	846	%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-bug.png
770	%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-irc.png
771	%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-list.png	847	%%ADMIN%%%%DATADIR%%/admin/static/images/other/contact-list.png
772	%%ADMIN%%%%DATADIR%%/admin/static/images/other/facebook.png	848	%%ADMIN%%%%DATADIR%%/admin/static/images/other/facebook.png
773	%%ADMIN%%%%DATADIR%%/admin/static/images/other/octality-logo.png	849	%%ADMIN%%%%DATADIR%%/admin/static/images/other/octality-logo.png
Lines 951-956 Link Here
951	%%ADMIN%%@dirrm %%DATADIR%%/admin/static/css	1027	%%ADMIN%%@dirrm %%DATADIR%%/admin/static/css
952	%%ADMIN%%@dirrm %%DATADIR%%/admin/static	1028	%%ADMIN%%@dirrm %%DATADIR%%/admin/static
953	%%ADMIN%%@dirrm %%DATADIR%%/admin/plugins	1029	%%ADMIN%%@dirrm %%DATADIR%%/admin/plugins
		1030	%%ADMIN%%@dirrm %%DATADIR%%/admin/market
954	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js	1031	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js
955	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images	1032	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images
956	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css	1033	%%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css

Return to bug 152339

Line 0 Link Here

(-)cherokee-new/files/patch-cherokee-admin-systemstats.py (+149 lines)
		1	--- admin/SystemStats.py-orig 2010-11-03 13:54:15.000000000 -0300
		2	+++ admin/SystemStats.py 2010-11-17 16:55:53.000000000 -0300
		3	@@ -42,6 +42,9 @@
		4	_stats = System_stats__Linux()
		5	elif sys.platform == 'darwin':
		6	_stats = System_stats__Darwin()
		7	+ elif sys.platform.rstrip('987') == 'freebsd' :
		8	+ _stats = System_stats__FreeBSD()
		9	+
		10
		11	assert _stats, "Not implemented"
		12	return _stats
		13	@@ -286,6 +289,130 @@
		14	time.sleep (self.CHECK_INTERVAL)
		15
		16
		17	+
		18	+# FreeBSD implementation
		19	+class System_stats__FreeBSD (Thread, System_stats):
		20	+ CHECK_INTERVAL = 2
		21	+
		22	+ def __init__ (self):
		23	+ Thread.__init__ (self)
		24	+ System_stats.__init__ (self)
		25	+
		26	+ self.cpu._user_prev = 0
		27	+ self.cpu._sys_prev = 0
		28	+ self.cpu._nice_prev = 0
		29	+ self.cpu._idle_prev = 0
		30	+
		31	+ # Read valid values
		32	+ self._read_hostname()
		33	+ self._read_cpu()
		34	+ self._read_memory()
		35	+ self._read_cpu_info()
		36	+
		37	+ self.start()
		38	+
		39	+ def _read_hostname (self):
		40	+ import os
		41	+
		42	+ hname = os.uname()[1]
		43	+
		44	+ if not hname:
		45	+ # Execute sysctl
		46	+ fd = subprocess.Popen ("/sbin/sysctl -n kern.hostname", shell=True, stdout = subprocess.PIPE)
		47	+ hname = fd.stdout.readline().strip()
		48	+
		49	+ self.hostname=hname
		50	+
		51	+ def _read_cpu_info (self):
		52	+
		53	+ fd = subprocess.Popen("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu", shell=True, stdout =subprocess.PIPE)
		54	+ lines = fd.stdout.readlines()
		55	+
		56	+
		57	+ ncpus=0
		58	+ vcpus=0
		59	+ clock=''
		60	+
		61	+ for line in lines:
		62	+ parts = line.split()
		63	+ if parts[0] == 'hw.ncpu:':
		64	+ ncpus = int(parts[1])
65	+ elif parts[0] == 'hw.clockrate:':
66	+ clock = parts[1]
67	+ elif parts[0] == 'kern.threads.virtual_cpu:':
68	+ vcpus = parts[1]
69	+
70	+
71	+ # FIXME: Is this reliable?
72	+ self.cpu.num=str(int(vcpus)/int(ncpus))
73	+ self.cpu.cores=vcpus
74	+
75	+ self.cpu.speed = '%s MHz' %(clock)
76	+
77	+ def _read_cpu (self):
78	+ fd = subprocess.Popen("/sbin/sysctl -n kern.cp_time", shell=True, stdout =subprocess.PIPE)
79	+
80	+ fields = fd.stdout.readline().split()
81	+
82	+ user = float(fields[0])
83	+ sys = float(fields[1])
84	+ nice = float(fields[2])
85	+# intr = float(fields[3]) # 4th is interrupts, not used
86	+ idle = float(fields[4])
87	+
88	+ total = ((user - self.cpu._user_prev) + (sys - self.cpu._sys_prev) + (nice - self.cpu._nice_prev) + (idle - self.cpu._idle_prev))
89	+ self.cpu.usage = int(100.0 * ((user + sys + nice) - (self.cpu._user_prev + self.cpu._sys_prev + self.cpu._nice_prev)) / (total + 0.001) + 0.5)
90	+
91	+ if (self.cpu.usage > 100):
92	+ self.cpu.usage = 100
93	+
94	+ self.cpu.idle = 100 - self.cpu.usage
95	+
96	+ self.cpu._user_prev = user
97	+ self.cpu._sys_prev = sys
98	+ self.cpu._nice_prev = nice
99	+ self.cpu._idle_prev = idle
100	+
101	+ def _read_memory (self):
102	+
103	+ # What we need from sysctl:
104	+ # * vm.stats.vm.v_free_count
105	+ # * vm.stats.vm.v_page_count
106	+ # * hw.pagesize
107	+
108	+ # physical memory free = v_free_count*page_size;
109	+ # physical memory size = v_page_count*page_size;
110	+ # physical memory used = size - free space
111	+
112	+ fd = subprocess.Popen("/sbin/sysctl vm.stats.vm.v_free_count vm.stats.vm.v_page_count hw.pagesize", shell=True, stdout =subprocess.PIPE)
113	+ lines = fd.stdout.readlines()
114	+
115	+ pagesize = 0
116	+ pagecount = 0
117	+ freecount = 0
118	+
119	+ for line in lines:
120	+ parts = line.split()
121	+ if parts[0] == 'hw.pagesize:':
122	+ pagesize = int(parts[1])
123	+ elif parts[0] == 'vm.stats.vm.v_free_count:':
124	+ freecount = int(parts[1])
125	+ elif parts[0] == 'vm.stats.vm.v_page_count:':
126	+ pagecount = int(parts[1])
127	+
128	+
129	+ self.mem.total = (pagesize * pagecount) / 1024
130	+ self.mem.free = (pagesize * freecount) / 1024
131	+ self.mem.used = (pagesize * (pagecount-freecount)) / 1024
132	+
133	+
134	+ def run (self):
135	+ while True:
136	+ self._read_cpu()
137	+ self._read_memory()
138	+ time.sleep (self.CHECK_INTERVAL)
139	+
140	+
141	if __name__ == '__main__':
142	sys_stats = get_system_stats()
143
144	@@ -305,3 +432,5 @@
145	print 'free', sys_stats.mem.free
146
147	time.sleep(1)
148	+
149	+

Line 0 Link Here

(-)cherokee-new/files/patch-cherokee-main_admin.c (+13 lines)
	1	--- cherokee/main_admin.c-orig 2010-10-29 07:11:18.000000000 -0300
	2	+++ cherokee/main_admin.c 2010-11-15 16:56:39.000000000 -0300
	3	@@ -35,6 +35,10 @@
	4	#include "server-protected.h"
	5	#include "util.h"
	6
	7	+#ifdef HAVE_SYS_WAIT_H
	8	+# include <sys/wait.h>
	9	+#endif
	10	+
	11	#ifdef HAVE_GETOPT_LONG
	12	# include <getopt.h>
	13	#else

Line 0 Link Here

(-)cherokee-new/files/patch-cherokee-util.c (+14 lines)
	1	--- cherokee/util.c-orig 2010-11-15 17:53:34.000000000 -0300
	2	+++ cherokee/util.c 2010-11-15 17:56:46.000000000 -0300
	3	@@ -38,6 +38,11 @@
	4	#include <errno.h>
	5	#include <fcntl.h>
	6
	7	+
	8	+#ifdef HAVE_SYS_WAIT_H
	9	+# include <sys/wait.h>
	10	+#endif
	11	+
	12	#ifdef HAVE_SYS_TIME_H
	13	# include <sys/time.h>
	14	#else

Lines 2-19 Link Here

(-)cherokee-new/files/pkg-install.in (-5 / +5 lines)
2		2
3	PATH=/bin:/usr/bin:/usr/sbin	3	PATH=/bin:/usr/bin:/usr/sbin
4		4
5	FILEMODE=0640
6		5
7	C_ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}	6	C_ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}
8	C_ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}	7	C_ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}
9	C_USER=${CHEROKEE_USER:-www}	8	C_USER=${CHEROKEE_LOGFILE_USER:-root}
10	C_GROUP=${CHEROKEE_GROUP:-www}	9	C_GROUP=${CHEROKEE_LOGFILE_GROUP:-wheel}
		10	C_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE:-0640}
11		11
12	case $2 in	12	case $2 in
13		13
14	POST-INSTALL)	14	POST-INSTALL)
15	echo "$2 for $1"	15	echo "$2 for $1"
16	echo "Adjusting ownership (${C_USER}:${C_GROUP}) and permissions (${FILEMODE}) on log files:"	16	echo "Adjusting ownership (${C_USER}:${C_GROUP}) and permissions (${C_FILEMODE}) on log files:"
17	echo "${C_ACCESSLOG}"	17	echo "${C_ACCESSLOG}"
18	echo "${C_ERRORLOG}"	18	echo "${C_ERRORLOG}"
19		19
Lines 26-32 Link Here
26	fi	26	fi
27		27
28	chown ${C_USER}:${C_GROUP} ${C_ACCESSLOG} ${C_ERRORLOG}	28	chown ${C_USER}:${C_GROUP} ${C_ACCESSLOG} ${C_ERRORLOG}
29	chmod ${FILEMODE} ${C_ACCESSLOG} ${C_ERRORLOG}	29	chmod ${C_FILEMODE} ${C_ACCESSLOG} ${C_ERRORLOG}
30		30
31	;;	31	;;
32		32