Hi. This diff updates cherokee to the latest release. Comments/OK?
Index: Makefile =================================================================== RCS file: /cvs/ports/www/cherokee/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 27 Jul 2009 17:06:16 -0000 1.10 +++ Makefile 12 Jan 2010 10:46:42 -0000 @@ -8,8 +8,8 @@ COMMENT-mysql = MySQL module for Cherokee web server COMMENT-streaming = Streaming module for Cherokee web server -VERSION = 0.99.20 DIR = 0.99 +VERSION = ${DIR}.39 DISTNAME = cherokee-${VERSION} PKGNAME-main = ${DISTNAME} @@ -49,7 +49,8 @@ LIB_DEPENDS-main = pcre::devel/pcre WANTLIB-main = c crypto pthread ssl -RUN_DEPENDS-main = ::www/spawn-fcgi +RUN_DEPENDS-main = ::www/spawn-fcgi \ + ::net/rrdtool LIB_DEPENDS-geoip = GeoIP.>=6::net/GeoIP WANTLIB-geoip = crypto @@ -68,9 +69,6 @@ WANTLIB-streaming = crypto m RUN_DEPENDS-streaming = ::${BASE_PKGPATH} -FLAVORS = debug -FLAVOR ?= - USE_LIBTOOL = Yes LIBTOOL_FLAGS = --tag=disable-static @@ -89,6 +87,8 @@ --localstatedir=/var \ --enable-tls=openssl \ --with-wwwroot=/var/cherokee \ + --with-wwwuser=_cherokee \ + --with-wwwgroup=_cherokee \ --disable-nls \ --disable-pam \ --with-geoip \ @@ -96,7 +96,7 @@ --with-mysql \ --with-ffmpeg -.if ${FLAVOR:L:Mdebug} +.ifdef DEBUG CFLAGS += -O0 -g3 CONFIGURE_ARGS += --enable-trace .endif @@ -109,5 +109,9 @@ .for i in ${SUBST_PY} @perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},s' ${WRKSRC}/${i} .endfor + +post-install: + cd ${PREFIX}/share/cherokee/admin && find . -name "*.py" | \ + xargs ${MODPY_BIN} ${MODPY_LIBDIR}/py_compile.py .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/cherokee/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 27 Jul 2009 17:06:16 -0000 1.5 +++ distinfo 12 Jan 2010 10:46:42 -0000 @@ -1,5 +1,5 @@ -MD5 (cherokee-0.99.20.tar.gz) = eKNw97AS536iJ4wQSLrnVA== -RMD160 (cherokee-0.99.20.tar.gz) = 0W7zuTXRCM4t+KCs3dp1gQWKDAU= -SHA1 (cherokee-0.99.20.tar.gz) = HNIObtThz61AhLk6fKCQkDlzhJE= -SHA256 (cherokee-0.99.20.tar.gz) = rtTQkyCSDdJV0NaMVVUkS6lAOGwkRwra7vhZi96o4zM= -SIZE (cherokee-0.99.20.tar.gz) = 4698370 +MD5 (cherokee-0.99.39.tar.gz) = LpaUJo7aOHSJsQsuI34pGg== +RMD160 (cherokee-0.99.39.tar.gz) = nMjKWmhooWLk8Qep8ITKD+dFQuQ= +SHA1 (cherokee-0.99.39.tar.gz) = 2eiJFtntBseP3gVg0FD3cGmB+p0= +SHA256 (cherokee-0.99.39.tar.gz) = qAYUfU6T2xPWW4U7fkSG5JroiTVzUDFC0R7+vIJv1P0= +SIZE (cherokee-0.99.39.tar.gz) = 4821995 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 12 Jan 2010 10:46:42 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Dec 29 12:40:39 2009 ++++ Makefile.in Tue Jan 12 11:04:06 2010 +@@ -1048,10 +1048,6 @@ uninstall-local-config: + fi + + install-data-local: $(CONFS) install-data-local-config +- @$(mkinstalldirs) $(DESTDIR)$(localstatedir) +- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run +- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log +- @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/cherokee/graphs/images + @$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir) + @$(mkinstalldirs) $(DESTDIR)$(cherokeeadmindir) + @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ +@@ -1069,7 +1065,6 @@ install-data-local: $(CONFS) install-data-local-config + @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \ + $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \ + fi +- $(mkinstalldirs) $(DESTDIR)$(localstatedir) + + uninstall-local: uninstall-local-config + @if test -f $(DESTDIR)$(cherokeeconfdir)/cherokee.conf ; then \ Index: patches/patch-admin_configured_py_pre =================================================================== RCS file: patches/patch-admin_configured_py_pre diff -N patches/patch-admin_configured_py_pre --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-admin_configured_py_pre 12 Jan 2010 10:46:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- admin/configured.py.pre.orig Tue Jan 12 10:52:14 2010 ++++ admin/configured.py.pre Tue Jan 12 10:52:25 2010 +@@ -21,5 +21,5 @@ CHEROKEE_DATADIR = join (DATADIR, "cherokee") + CHEROKEE_DEPSDIR = join (DATADIR, "cherokee/deps") + CHEROKEE_CONFDIR = join (SYSCONFDIR, "cherokee") + CHEROKEE_VAR_RUN = join (LOCALSTATE, "run") +-CHEROKEE_RRD_DIR = join (LOCALSTATE, "lib/cherokee/graphs") +-CHEROKEE_GRAPHS_DIR = join (LOCALSTATE, "lib/cherokee/graphs/images") ++CHEROKEE_RRD_DIR = join (LOCALSTATE, "db/cherokee/graphs") ++CHEROKEE_GRAPHS_DIR = join (LOCALSTATE, "db/cherokee/graphs/images") Index: patches/patch-cherokee_Makefile_in =================================================================== RCS file: /cvs/ports/www/cherokee/patches/patch-cherokee_Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-cherokee_Makefile_in --- patches/patch-cherokee_Makefile_in 27 Jul 2009 17:06:16 -0000 1.5 +++ patches/patch-cherokee_Makefile_in 12 Jan 2010 10:46:42 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-cherokee_Makefile_in,v 1.5 2009/07/27 17:06:16 sthen Exp $ ---- cherokee/Makefile.in.orig Wed Jul 1 14:57:29 2009 -+++ cherokee/Makefile.in Thu Jul 23 22:57:56 2009 -@@ -1286,7 +1286,8 @@ $(common_ldflags) \ +--- cherokee/Makefile.in.orig Tue Jan 12 10:22:09 2010 ++++ cherokee/Makefile.in Tue Jan 12 10:24:05 2010 +@@ -1385,7 +1385,8 @@ $(common_ldflags) \ -module \ -avoid-version \ -export-dynamic \ --$(module_ldflags_w32) +-$(module_ldflags_w32) +$(module_ldflags_w32) \ +-Wl,-rpath,${PREFIX}/lib/cherokee Index: patches/patch-cherokee_conf_sample_pre =================================================================== RCS file: /cvs/ports/www/cherokee/patches/patch-cherokee_conf_sample_pre,v retrieving revision 1.4 diff -u -r1.4 patch-cherokee_conf_sample_pre --- patches/patch-cherokee_conf_sample_pre 27 Jul 2009 17:06:16 -0000 1.4 +++ patches/patch-cherokee_conf_sample_pre 12 Jan 2010 10:46:42 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-cherokee_conf_sample_pre,v 1.4 2009/07/27 17:06:16 sthen Exp $ ---- cherokee.conf.sample.pre.orig Mon May 25 08:16:06 2009 -+++ cherokee.conf.sample.pre Tue Jun 9 22:35:47 2009 +--- cherokee.conf.sample.pre.orig Tue Jan 12 10:24:13 2010 ++++ cherokee.conf.sample.pre Tue Jan 12 10:26:20 2010 @@ -13,6 +13,9 @@ # server!bind!1!port = 80 @@ -11,20 +11,21 @@ server!keepalive = 1 server!keepalive_max_requests = 500 server!server_tokens = full -@@ -27,10 +30,10 @@ vserver!1!directory_index = index.html +@@ -27,11 +30,11 @@ vserver!1!directory_index = index.html vserver!1!logger = combined vserver!1!logger!access!type = file -vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access +vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access vserver!1!logger!access!buffsize = 16384 - vserver!1!logger!error!type = file --vserver!1!logger!error!filename = %localstatedir%/log/cherokee.error -+vserver!1!logger!error!filename = %localstatedir%/log/cherokee/cherokee.error + + vserver!1!error_writer!type = file +-vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error ++vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error vserver!1!rule!1!match = default vserver!1!rule!1!handler = common -@@ -48,7 +51,7 @@ vserver!1!rule!3!handler = file +@@ -49,7 +52,7 @@ vserver!1!rule!3!handler = file vserver!1!rule!4!match = directory vserver!1!rule!4!match!directory = /cgi-bin Index: patches/patch-cherokee_server_c =================================================================== RCS file: patches/patch-cherokee_server_c diff -N patches/patch-cherokee_server_c --- patches/patch-cherokee_server_c 27 Jul 2009 17:06:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-cherokee_server_c,v 1.1 2009/07/27 17:06:16 sthen Exp $ - -getgrnam_r() needs a larger buffer on OpenBSD (and some other systems). - ---- cherokee/server.c.orig Mon Jun 29 18:17:39 2009 -+++ cherokee/server.c Thu Jul 23 23:59:32 2009 -@@ -88,6 +88,7 @@ - #include "source_interpreter.h" - - #define ENTRIES "core,server" -+#define GRBUF_SIZE 8192 - - ret_t - cherokee_server_new (cherokee_server_t **srv) -@@ -1356,7 +1357,7 @@ configure_server_property (cherokee_config_node_t *con - - } else if (equal_buf_str (&conf->key, "group")) { - struct group grp; -- char tmp[1024]; -+ char tmp[GRBUF_SIZE]; - - ret = cherokee_getgrnam (conf->val.buf, &grp, tmp, sizeof(tmp)); - if (ret != ret_ok) { Index: patches/patch-cherokee_source_interpreter_c =================================================================== RCS file: patches/patch-cherokee_source_interpreter_c diff -N patches/patch-cherokee_source_interpreter_c --- patches/patch-cherokee_source_interpreter_c 27 Jul 2009 17:06:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-cherokee_source_interpreter_c,v 1.1 2009/07/27 17:06:16 sthen Exp $ - -getgrnam_r() needs a larger buffer on OpenBSD (and some other systems). - ---- cherokee/source_interpreter.c.orig Mon Jun 29 18:43:26 2009 -+++ cherokee/source_interpreter.c Thu Jul 23 23:58:55 2009 -@@ -37,6 +37,7 @@ - - #define ENTRIES "source,src,interpreter" - #define DEFAULT_TIMEOUT 10 -+#define GRBUF_SIZE 8192 - - - static void interpreter_free (void *src); -@@ -280,7 +281,7 @@ cherokee_source_interpreter_configure (cherokee_source - - } else if (equal_buf_str (&child->key, "group")) { - struct group grp; -- char tmp[1024]; -+ char tmp[GRBUF_SIZE]; - - ret = cherokee_getgrnam (child->val.buf, &grp, tmp, sizeof(tmp)); - if (ret != ret_ok) { Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/www/cherokee/patches/patch-configure,v retrieving revision 1.6 diff -u -r1.6 patch-configure --- patches/patch-configure 27 Jul 2009 17:06:16 -0000 1.6 +++ patches/patch-configure 12 Jan 2010 10:46:42 -0000 @@ -1,24 +1,24 @@ $OpenBSD: patch-configure,v 1.6 2009/07/27 17:06:16 sthen Exp $ ---- configure.orig Wed Jul 1 14:57:31 2009 -+++ configure Thu Jul 23 22:57:56 2009 -@@ -32366,13 +32366,13 @@ echo "${ECHO_T}no" >&6; } +--- configure.orig Tue Jan 12 10:27:34 2010 ++++ configure Tue Jan 12 10:28:23 2010 +@@ -16613,13 +16613,13 @@ $as_echo "no" >&6; } esac if test "$have_pthread" != "yes"; then -- { echo "$as_me:$LINENO: checking for main in -lpthread" >&5 --echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for main in -pthread" >&5 -+echo $ECHO_N "checking for main in -pthread... $ECHO_C" >&6; } - if test "${ac_cv_lib_pthread_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 +-$as_echo_n "checking for main in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -pthread" >&5 ++$as_echo_n "checking for main in -pthread... " >&6; } + if test "${ac_cv_lib_pthread_main+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32428,7 +32428,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16650,7 +16650,7 @@ else fi if test "$have_pthread" = "yes"; then @@ -27,12 +27,12 @@ fi fi -@@ -39215,7 +39215,7 @@ if test "${ac_cv_lib_avformat_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -20249,7 +20249,7 @@ if test "${ac_cv_lib_avformat_main+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lavformat $LIBS" +LIBS="-lavformat -pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + Index: patches/patch-constants_h_pre =================================================================== RCS file: patches/patch-constants_h_pre diff -N patches/patch-constants_h_pre --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-constants_h_pre 12 Jan 2010 10:46:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- constants.h.pre.orig Tue Jan 12 10:51:31 2010 ++++ constants.h.pre Tue Jan 12 10:51:58 2010 +@@ -16,6 +16,6 @@ + # define CHEROKEE_ICONSDIR "%prefix%/share/cherokee/icons" + # define CHEROKEE_THEMEDIR "%prefix%/share/cherokee/themes" + # define CHEROKEE_PANIC_PATH "%prefix%/bin/cherokee-panic" +-# define CHEROKEE_RRD_DIR "%localstatedir%/lib/cherokee/graphs" ++# define CHEROKEE_RRD_DIR "%localstatedir%/db/cherokee/graphs" + + #endif Index: patches/patch-contrib_Makefile_in =================================================================== RCS file: /cvs/ports/www/cherokee/patches/patch-contrib_Makefile_in,v retrieving revision 1.4 diff -u -r1.4 patch-contrib_Makefile_in --- patches/patch-contrib_Makefile_in 27 Jul 2009 17:06:16 -0000 1.4 +++ patches/patch-contrib_Makefile_in 12 Jan 2010 10:46:42 -0000 @@ -2,14 +2,14 @@ remove gratuitous GNUism, allows building with /usr/bin/make ---- contrib/Makefile.in.orig Tue Jun 9 12:23:53 2009 -+++ contrib/Makefile.in Tue Jun 9 22:35:47 2009 -@@ -389,7 +389,7 @@ uninstall-am: +--- contrib/Makefile.in.orig Tue Jan 12 10:28:34 2010 ++++ contrib/Makefile.in Tue Jan 12 10:28:59 2010 +@@ -421,7 +421,7 @@ uninstall-am: cherokee: cherokee.pre -- sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|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|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g; s|%phpcgi%|${PHPCGI}|g" cherokee.pre > $@ +- sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%sbindir%|${sbindir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g; s|%phpcgi%|${PHPCGI}|g; s|%datadir%|${datadir}|g; s|%localedir%|${localedir}|g" $< > $@ ++ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%sbindir%|${sbindir}|g; s|%docdir%|${docdir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%libdir%|${libdir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%version%|${PACKAGE_VERSION}|g; s|%phpcgi%|${PHPCGI}|g; s|%datadir%|${datadir}|g; s|%localedir%|${localedir}|g" cherokee.pre > $@ all-local: cherokee - # Tell versions [3.59,3.63) of GNU make to not export all variables. + Index: pkg/MESSAGE-main =================================================================== RCS file: /cvs/ports/www/cherokee/pkg/MESSAGE-main,v retrieving revision 1.2 diff -u -r1.2 MESSAGE-main --- pkg/MESSAGE-main 26 Nov 2008 09:05:31 -0000 1.2 +++ pkg/MESSAGE-main 12 Jan 2010 10:46:42 -0000 @@ -1,12 +1,12 @@ To complete the installation, you need to configure cherokee. As root: - # cherokee-admin -b [IP] + # cherokee-admin -b [IP] (where IP is a trusted IP used to configure your web server) If you want to run cherokee on boot, add these lines to /etc/rc.local: if [ X"${cherokee_flags}" != X"NO" ]; then echo -n ' cherokee' - ${PREFIX}/sbin/cherokee-guardian ${cherokee_flags} 1> /dev/null + ${PREFIX}/sbin/cherokee ${cherokee_flags} 1> /dev/null fi for admin management: @@ -16,7 +16,7 @@ ${PREFIX}/sbin/cherokee-admin ${cherokee-admin_flags} 1> /dev/null & fi -and in /etc/rc.conf.local : +and in /etc/rc.conf.local: cherokee_flags="-d" # use -d to run in daemon mode cherokee-admin_flags=NO # use -b if you want listen on ALL interfaces Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/www/cherokee/pkg/PLIST-main,v retrieving revision 1.7 diff -u -r1.7 PLIST-main --- pkg/PLIST-main 27 Jul 2009 17:06:16 -0000 1.7 +++ pkg/PLIST-main 12 Jan 2010 10:46:43 -0000 @@ -34,6 +34,7 @@ include/cherokee/mime_entry.h include/cherokee/module.h include/cherokee/nonce.h +include/cherokee/nullable.h include/cherokee/plugin.h include/cherokee/plugin_loader.h include/cherokee/post.h @@ -107,16 +108,12 @@ lib/cherokee/libplugin_libssl.so @comment lib/cherokee/libplugin_method.la lib/cherokee/libplugin_method.so -...@comment lib/cherokee/libplugin_mirror.la -lib/cherokee/libplugin_mirror.so @comment lib/cherokee/libplugin_ncsa.la lib/cherokee/libplugin_ncsa.so @comment lib/cherokee/libplugin_not.la lib/cherokee/libplugin_not.so @comment lib/cherokee/libplugin_or.la lib/cherokee/libplugin_or.so -...@comment lib/cherokee/libplugin_phpcgi.la -lib/cherokee/libplugin_phpcgi.so @comment lib/cherokee/libplugin_plain.la @comment lib/cherokee/libplugin_plain.so @comment lib/cherokee/libplugin_proxy.la @@ -125,10 +122,14 @@ lib/cherokee/libplugin_redir.so @comment lib/cherokee/libplugin_rehost.la lib/cherokee/libplugin_rehost.so +...@comment lib/cherokee/libplugin_render_rrd.la +lib/cherokee/libplugin_render_rrd.so @comment lib/cherokee/libplugin_request.la lib/cherokee/libplugin_request.so @comment lib/cherokee/libplugin_round_robin.la lib/cherokee/libplugin_round_robin.so +...@comment lib/cherokee/libplugin_rrd.la +lib/cherokee/libplugin_rrd.so @comment lib/cherokee/libplugin_scgi.la lib/cherokee/libplugin_scgi.so @comment lib/cherokee/libplugin_secdownload.la @@ -137,6 +138,12 @@ lib/cherokee/libplugin_server_info.so @comment lib/cherokee/libplugin_ssi.la lib/cherokee/libplugin_ssi.so +...@comment lib/cherokee/libplugin_target_ip.la +lib/cherokee/libplugin_target_ip.so +...@comment lib/cherokee/libplugin_url_arg.la +lib/cherokee/libplugin_url_arg.so +...@comment lib/cherokee/libplugin_uwsgi.la +lib/cherokee/libplugin_uwsgi.so @comment lib/cherokee/libplugin_wildcard.la lib/cherokee/libplugin_wildcard.so @comment lib/libcherokee-base.la @@ -162,102 +169,238 @@ share/cherokee/ share/cherokee/admin/ share/cherokee/admin/CherokeeManagement.py +share/cherokee/admin/CherokeeManagement.pyc share/cherokee/admin/Entry.py +share/cherokee/admin/Entry.pyc share/cherokee/admin/Form.py +share/cherokee/admin/Form.pyc +share/cherokee/admin/GraphManager.py +share/cherokee/admin/GraphManager.pyc share/cherokee/admin/Module.py +share/cherokee/admin/Module.pyc share/cherokee/admin/ModuleAdmin.py +share/cherokee/admin/ModuleAdmin.pyc share/cherokee/admin/ModuleAuth.py +share/cherokee/admin/ModuleAuth.pyc share/cherokee/admin/ModuleAuthlist.py +share/cherokee/admin/ModuleAuthlist.pyc share/cherokee/admin/ModuleBalancer.py +share/cherokee/admin/ModuleBalancer.pyc share/cherokee/admin/ModuleBind.py +share/cherokee/admin/ModuleBind.pyc share/cherokee/admin/ModuleCgi.py +share/cherokee/admin/ModuleCgi.pyc share/cherokee/admin/ModuleCommon.py +share/cherokee/admin/ModuleCommon.pyc share/cherokee/admin/ModuleCustomError.py +share/cherokee/admin/ModuleCustomError.pyc share/cherokee/admin/ModuleDbslayer.py +share/cherokee/admin/ModuleDbslayer.pyc share/cherokee/admin/ModuleDefault.py +share/cherokee/admin/ModuleDefault.pyc share/cherokee/admin/ModuleDirectory.py +share/cherokee/admin/ModuleDirectory.pyc share/cherokee/admin/ModuleDirlist.py +share/cherokee/admin/ModuleDirlist.pyc share/cherokee/admin/ModuleEmptyGif.py +share/cherokee/admin/ModuleEmptyGif.pyc share/cherokee/admin/ModuleErrorNn.py +share/cherokee/admin/ModuleErrorNn.pyc share/cherokee/admin/ModuleErrorRedir.py +share/cherokee/admin/ModuleErrorRedir.pyc share/cherokee/admin/ModuleEvhost.py +share/cherokee/admin/ModuleEvhost.pyc share/cherokee/admin/ModuleExists.py +share/cherokee/admin/ModuleExists.pyc share/cherokee/admin/ModuleExtensions.py +share/cherokee/admin/ModuleExtensions.pyc share/cherokee/admin/ModuleFcgi.py +share/cherokee/admin/ModuleFcgi.pyc share/cherokee/admin/ModuleFile.py +share/cherokee/admin/ModuleFile.pyc share/cherokee/admin/ModuleFrom.py +share/cherokee/admin/ModuleFrom.pyc share/cherokee/admin/ModuleFullpath.py +share/cherokee/admin/ModuleFullpath.pyc share/cherokee/admin/ModuleGeoip.py +share/cherokee/admin/ModuleGeoip.pyc share/cherokee/admin/ModuleHandler.py +share/cherokee/admin/ModuleHandler.pyc share/cherokee/admin/ModuleHeader.py +share/cherokee/admin/ModuleHeader.pyc share/cherokee/admin/ModuleHtdigest.py +share/cherokee/admin/ModuleHtdigest.pyc share/cherokee/admin/ModuleHtpasswd.py +share/cherokee/admin/ModuleHtpasswd.pyc share/cherokee/admin/ModuleIpHash.py +share/cherokee/admin/ModuleIpHash.pyc share/cherokee/admin/ModuleLdap.py +share/cherokee/admin/ModuleLdap.pyc share/cherokee/admin/ModuleMethod.py -share/cherokee/admin/ModuleMirror.py +share/cherokee/admin/ModuleMethod.pyc share/cherokee/admin/ModuleMysql.py +share/cherokee/admin/ModuleMysql.pyc share/cherokee/admin/ModulePam.py +share/cherokee/admin/ModulePam.pyc share/cherokee/admin/ModulePlain.py +share/cherokee/admin/ModulePlain.pyc share/cherokee/admin/ModuleProxy.py +share/cherokee/admin/ModuleProxy.pyc share/cherokee/admin/ModuleRedir.py +share/cherokee/admin/ModuleRedir.pyc share/cherokee/admin/ModuleRehost.py +share/cherokee/admin/ModuleRehost.pyc share/cherokee/admin/ModuleRequest.py +share/cherokee/admin/ModuleRequest.pyc share/cherokee/admin/ModuleRoundRobin.py +share/cherokee/admin/ModuleRoundRobin.pyc +share/cherokee/admin/ModuleRrd.py +share/cherokee/admin/ModuleRrd.pyc share/cherokee/admin/ModuleScgi.py +share/cherokee/admin/ModuleScgi.pyc share/cherokee/admin/ModuleSecdownload.py +share/cherokee/admin/ModuleSecdownload.pyc share/cherokee/admin/ModuleServerInfo.py +share/cherokee/admin/ModuleServerInfo.pyc share/cherokee/admin/ModuleSsi.py +share/cherokee/admin/ModuleSsi.pyc share/cherokee/admin/ModuleStreaming.py +share/cherokee/admin/ModuleStreaming.pyc +share/cherokee/admin/ModuleTargetIp.py +share/cherokee/admin/ModuleTargetIp.pyc +share/cherokee/admin/ModuleUrlArg.py +share/cherokee/admin/ModuleUrlArg.pyc +share/cherokee/admin/ModuleUwsgi.py +share/cherokee/admin/ModuleUwsgi.pyc share/cherokee/admin/ModuleWildcard.py +share/cherokee/admin/ModuleWildcard.pyc share/cherokee/admin/Page.py +share/cherokee/admin/Page.pyc share/cherokee/admin/PageAdvanced.py +share/cherokee/admin/PageAdvanced.pyc share/cherokee/admin/PageAjaxUpdate.py +share/cherokee/admin/PageAjaxUpdate.pyc share/cherokee/admin/PageEntry.py +share/cherokee/admin/PageEntry.pyc share/cherokee/admin/PageError.py +share/cherokee/admin/PageError.pyc share/cherokee/admin/PageFeedback.py +share/cherokee/admin/PageFeedback.pyc share/cherokee/admin/PageGeneral.py +share/cherokee/admin/PageGeneral.pyc share/cherokee/admin/PageIcon.py +share/cherokee/admin/PageIcon.pyc share/cherokee/admin/PageInfoSource.py +share/cherokee/admin/PageInfoSource.pyc share/cherokee/admin/PageMime.py +share/cherokee/admin/PageMime.pyc share/cherokee/admin/PageNewConfig.py +share/cherokee/admin/PageNewConfig.pyc share/cherokee/admin/PageStatus.py +share/cherokee/admin/PageStatus.pyc share/cherokee/admin/PageVServer.py +share/cherokee/admin/PageVServer.pyc share/cherokee/admin/PageVServers.py +share/cherokee/admin/PageVServers.pyc share/cherokee/admin/Post.py +share/cherokee/admin/Post.pyc share/cherokee/admin/Rule.py +share/cherokee/admin/Rule.pyc share/cherokee/admin/RuleList.py +share/cherokee/admin/RuleList.pyc share/cherokee/admin/Table.py +share/cherokee/admin/Table.pyc share/cherokee/admin/Theme.py +share/cherokee/admin/Theme.pyc share/cherokee/admin/Wizard.py +share/cherokee/admin/Wizard.pyc +share/cherokee/admin/Wizard_Alfresco.py +share/cherokee/admin/Wizard_Alfresco.pyc +share/cherokee/admin/Wizard_ColdFusion.py +share/cherokee/admin/Wizard_ColdFusion.pyc +share/cherokee/admin/Wizard_CommonStatic.py +share/cherokee/admin/Wizard_CommonStatic.pyc +share/cherokee/admin/Wizard_Concrete5.py +share/cherokee/admin/Wizard_Concrete5.pyc share/cherokee/admin/Wizard_Django.py +share/cherokee/admin/Wizard_Django.pyc share/cherokee/admin/Wizard_Drupal.py +share/cherokee/admin/Wizard_Drupal.pyc +share/cherokee/admin/Wizard_Glassfish.py +share/cherokee/admin/Wizard_Glassfish.pyc share/cherokee/admin/Wizard_HotLinking.py +share/cherokee/admin/Wizard_HotLinking.pyc +share/cherokee/admin/Wizard_Icons.py +share/cherokee/admin/Wizard_Icons.pyc +share/cherokee/admin/Wizard_Joomla.py +share/cherokee/admin/Wizard_Joomla.pyc +share/cherokee/admin/Wizard_Liferay.py +share/cherokee/admin/Wizard_Liferay.pyc share/cherokee/admin/Wizard_Mailman.py +share/cherokee/admin/Wizard_Mailman.pyc +share/cherokee/admin/Wizard_MoinMoin.py +share/cherokee/admin/Wizard_MoinMoin.pyc +share/cherokee/admin/Wizard_Mono.py +share/cherokee/admin/Wizard_Mono.pyc +share/cherokee/admin/Wizard_Moodle.py +share/cherokee/admin/Wizard_Moodle.pyc share/cherokee/admin/Wizard_PHP.py +share/cherokee/admin/Wizard_PHP.pyc share/cherokee/admin/Wizard_Redirect.py +share/cherokee/admin/Wizard_Redirect.pyc share/cherokee/admin/Wizard_RoR.py +share/cherokee/admin/Wizard_RoR.pyc +share/cherokee/admin/Wizard_Streaming.py +share/cherokee/admin/Wizard_Streaming.pyc +share/cherokee/admin/Wizard_Sugar.py +share/cherokee/admin/Wizard_Sugar.pyc +share/cherokee/admin/Wizard_Symfony.py +share/cherokee/admin/Wizard_Symfony.pyc +share/cherokee/admin/Wizard_Trac.py +share/cherokee/admin/Wizard_Trac.pyc share/cherokee/admin/Wizard_WordPress.py +share/cherokee/admin/Wizard_WordPress.pyc +share/cherokee/admin/Wizard_Zend.py +share/cherokee/admin/Wizard_Zend.pyc +share/cherokee/admin/Wizard_phpBB.py +share/cherokee/admin/Wizard_phpBB.pyc +share/cherokee/admin/Wizard_phpMyAdmin.py +share/cherokee/admin/Wizard_phpMyAdmin.pyc +share/cherokee/admin/Wizard_rTorrent.py +share/cherokee/admin/Wizard_rTorrent.pyc +share/cherokee/admin/Wizard_uWSGI.py +share/cherokee/admin/Wizard_uWSGI.pyc share/cherokee/admin/cherokee.conf.sample share/cherokee/admin/config.py +share/cherokee/admin/config.pyc +share/cherokee/admin/config_version.py +share/cherokee/admin/config_version.pyc share/cherokee/admin/configured.py +share/cherokee/admin/configured.pyc share/cherokee/admin/consts.py +share/cherokee/admin/consts.pyc share/cherokee/admin/default.template.html share/cherokee/admin/error_couldnt_launch.template.html share/cherokee/admin/error_icons_dir_missing.template.html +share/cherokee/admin/error_internal.template.html share/cherokee/admin/error_not_writable.template.html share/cherokee/admin/flags.py +share/cherokee/admin/flags.pyc share/cherokee/admin/performance.conf.sample share/cherokee/admin/pyscgi.py +share/cherokee/admin/pyscgi.pyc share/cherokee/admin/server.py +share/cherokee/admin/server.pyc share/cherokee/admin/static/ share/cherokee/admin/static/css/ share/cherokee/admin/static/css/cherokee.css +share/cherokee/admin/static/css/jquery.ibutton.css share/cherokee/admin/static/css/reset-min.css share/cherokee/admin/static/css/thickbox.css share/cherokee/admin/static/images/ share/cherokee/admin/static/images/arrow_ns.png share/cherokee/admin/static/images/arrow_ns_h.png +share/cherokee/admin/static/images/background-nobar.png share/cherokee/admin/static/images/background.png share/cherokee/admin/static/images/bin.png share/cherokee/admin/static/images/button-left.png @@ -268,8 +411,11 @@ share/cherokee/admin/static/images/dialog-error.png share/cherokee/admin/static/images/dialog-information.png share/cherokee/admin/static/images/dialog-warning.png +share/cherokee/admin/static/images/error.png +share/cherokee/admin/static/images/exclamation.png share/cherokee/admin/static/images/expanded.gif share/cherokee/admin/static/images/favicon.ico +share/cherokee/admin/static/images/feedback.png share/cherokee/admin/static/images/flags/ share/cherokee/admin/static/images/flags/ad.png share/cherokee/admin/static/images/flags/ae.png @@ -519,6 +665,7 @@ share/cherokee/admin/static/images/flags/zw.png share/cherokee/admin/static/images/forbidden.png share/cherokee/admin/static/images/help.png +share/cherokee/admin/static/images/ibutton-slider-default.png share/cherokee/admin/static/images/loadingAnimation.gif share/cherokee/admin/static/images/macFFBgHack.png share/cherokee/admin/static/images/menu-active.png @@ -526,28 +673,55 @@ share/cherokee/admin/static/images/menu-sep.png share/cherokee/admin/static/images/offline.png share/cherokee/admin/static/images/online.png +share/cherokee/admin/static/images/proud.png share/cherokee/admin/static/images/rulestable-th.png share/cherokee/admin/static/images/tab.png share/cherokee/admin/static/images/tick.png share/cherokee/admin/static/images/top-bar.png -share/cherokee/admin/static/images/web_proud.jpg share/cherokee/admin/static/images/wizards/ +share/cherokee/admin/static/images/wizards/alfresco.png +share/cherokee/admin/static/images/wizards/aspnet.png +share/cherokee/admin/static/images/wizards/coldfusion.png +share/cherokee/admin/static/images/wizards/common_static.png +share/cherokee/admin/static/images/wizards/concrete5.png +share/cherokee/admin/static/images/wizards/dbslayer.png share/cherokee/admin/static/images/wizards/django.png share/cherokee/admin/static/images/wizards/drupal.png +share/cherokee/admin/static/images/wizards/gallery.png +share/cherokee/admin/static/images/wizards/glassfish.png share/cherokee/admin/static/images/wizards/hotlinking.png +share/cherokee/admin/static/images/wizards/icons.png +share/cherokee/admin/static/images/wizards/joomla.png +share/cherokee/admin/static/images/wizards/liferay.png share/cherokee/admin/static/images/wizards/mailman.png +share/cherokee/admin/static/images/wizards/moinmoin.png +share/cherokee/admin/static/images/wizards/mono.png +share/cherokee/admin/static/images/wizards/moodle.png +share/cherokee/admin/static/images/wizards/nagios.png share/cherokee/admin/static/images/wizards/php.jpg +share/cherokee/admin/static/images/wizards/phpbb.png +share/cherokee/admin/static/images/wizards/phpmyadmin.png share/cherokee/admin/static/images/wizards/redirect.jpg share/cherokee/admin/static/images/wizards/ror.png +share/cherokee/admin/static/images/wizards/rtorrent.png +share/cherokee/admin/static/images/wizards/streaming.png +share/cherokee/admin/static/images/wizards/sugarcrm.png +share/cherokee/admin/static/images/wizards/symfony.png +share/cherokee/admin/static/images/wizards/trac.png +share/cherokee/admin/static/images/wizards/uwsgi.png share/cherokee/admin/static/images/wizards/wordpress.png +share/cherokee/admin/static/images/wizards/zend.png share/cherokee/admin/static/images/workarea.png share/cherokee/admin/static/js/ share/cherokee/admin/static/js/common.js +share/cherokee/admin/static/js/graphs.js share/cherokee/admin/static/js/icons.js -share/cherokee/admin/static/js/jquery-1.2.6.min.js +share/cherokee/admin/static/js/jquery-1.3.2.min.js share/cherokee/admin/static/js/jquery.cookie.js share/cherokee/admin/static/js/jquery.dimensions.js share/cherokee/admin/static/js/jquery.easing.js +share/cherokee/admin/static/js/jquery.form-defaults.js +share/cherokee/admin/static/js/jquery.ibutton.js share/cherokee/admin/static/js/jquery.tablednd.js share/cherokee/admin/static/js/thickbox.js share/cherokee/admin/static/js/ui.core.js @@ -557,8 +731,12 @@ share/cherokee/admin/static/js/ui.tabs.js share/cherokee/admin/static/js/wizards.js share/cherokee/admin/status.template.html +share/cherokee/admin/upgrade_config.py +share/cherokee/admin/upgrade_config.pyc share/cherokee/admin/util.py +share/cherokee/admin/util.pyc share/cherokee/admin/validations.py +share/cherokee/admin/validations.pyc share/cherokee/deps/ share/cherokee/deps/cgi.deps share/cherokee/deps/combined.deps @@ -566,10 +744,11 @@ share/cherokee/deps/error_redir.deps share/cherokee/deps/fastcgi.deps share/cherokee/deps/fcgi.deps -share/cherokee/deps/phpcgi.deps +share/cherokee/deps/render_rrd.deps share/cherokee/deps/scgi.deps share/cherokee/deps/secdownload.deps share/cherokee/deps/streaming.deps +share/cherokee/deps/uwsgi.deps share/cherokee/icons/ share/cherokee/icons/README.txt share/cherokee/icons/arrow_turn_left.png @@ -646,9 +825,12 @@ share/doc/cherokee/config_virtual_servers.html share/doc/cherokee/config_virtual_servers_evhost.html share/doc/cherokee/config_virtual_servers_rule.html +share/doc/cherokee/config_wizards.html share/doc/cherokee/cookbook.html share/doc/cherokee/cookbook_alfresco.html share/doc/cherokee/cookbook_authentication.html +share/doc/cherokee/cookbook_coldfusion.html +share/doc/cherokee/cookbook_concrete5.html share/doc/cherokee/cookbook_cross_compilation.html share/doc/cherokee/cookbook_dbslayer.html share/doc/cherokee/cookbook_django.html @@ -671,15 +853,18 @@ share/doc/cherokee/cookbook_redirs.html share/doc/cherokee/cookbook_ror.html share/doc/cherokee/cookbook_ssl.html +share/doc/cherokee/cookbook_streaming.html share/doc/cherokee/cookbook_sugarcrm.html share/doc/cherokee/cookbook_symfony.html share/doc/cherokee/cookbook_trac.html +share/doc/cherokee/cookbook_uwsgi.html share/doc/cherokee/cookbook_wordpress.html share/doc/cherokee/cookbook_zend.html share/doc/cherokee/dev.html share/doc/cherokee/dev_cherokee.conf.html share/doc/cherokee/dev_debug.html share/doc/cherokee/dev_issues.html +share/doc/cherokee/dev_qa.html share/doc/cherokee/index.html share/doc/cherokee/media/ share/doc/cherokee/media/css/ @@ -690,8 +875,8 @@ share/doc/cherokee/media/images/admin_advanced2.png share/doc/cherokee/media/images/admin_advanced3.png share/doc/cherokee/media/images/admin_advanced4.png +share/doc/cherokee/media/images/admin_advanced5.png share/doc/cherokee/media/images/admin_behaviour.png -share/doc/cherokee/media/images/admin_dirlist_cherokee.png share/doc/cherokee/media/images/admin_general.png share/doc/cherokee/media/images/admin_general_networking.png share/doc/cherokee/media/images/admin_general_permissions.png @@ -729,6 +914,10 @@ share/doc/cherokee/media/images/admin_vserver_loggers.png share/doc/cherokee/media/images/admin_vserver_security.png share/doc/cherokee/media/images/admin_vserver_vserver.png +share/doc/cherokee/media/images/admin_vserver_wizard.png +share/doc/cherokee/media/images/admin_vserver_wizard_misc.png +share/doc/cherokee/media/images/admin_vservers_wizard.png +share/doc/cherokee/media/images/admin_vservers_wizard_misc.png share/doc/cherokee/media/images/cookbook_alfresco_alfresco.png share/doc/cherokee/media/images/cookbook_alfresco_assistant.png share/doc/cherokee/media/images/cookbook_alfresco_install.png @@ -743,15 +932,8 @@ share/doc/cherokee/media/images/cookbook_django_common.png share/doc/cherokee/media/images/cookbook_django_infosources.png share/doc/cherokee/media/images/cookbook_drupal.png -share/doc/cherokee/media/images/cookbook_drupal_default1.png -share/doc/cherokee/media/images/cookbook_drupal_default2.png -share/doc/cherokee/media/images/cookbook_drupal_default3.png -share/doc/cherokee/media/images/cookbook_drupal_example1.png -share/doc/cherokee/media/images/cookbook_drupal_example2.png -share/doc/cherokee/media/images/cookbook_drupal_example3.png -share/doc/cherokee/media/images/cookbook_drupal_example4.png -share/doc/cherokee/media/images/cookbook_drupal_rules.png share/doc/cherokee/media/images/cookbook_glassfish.png +share/doc/cherokee/media/images/cookbook_joomla.png share/doc/cherokee/media/images/cookbook_liferay.png share/doc/cherokee/media/images/cookbook_mailman.png share/doc/cherokee/media/images/cookbook_maintenance_advanced_domains.png @@ -798,6 +980,7 @@ share/doc/cherokee/media/images/cookbook_ror.png share/doc/cherokee/media/images/cookbook_ror_common.png share/doc/cherokee/media/images/cookbook_ror_fcgi.png +share/doc/cherokee/media/images/cookbook_ror_wizard.png share/doc/cherokee/media/images/cookbook_sugarcrm_install0.png share/doc/cherokee/media/images/cookbook_sugarcrm_install1.png share/doc/cherokee/media/images/cookbook_sugarcrm_running0.png @@ -813,10 +996,11 @@ share/doc/cherokee/media/images/cookbook_wp3.png share/doc/cherokee/media/images/cookbook_wp4.png share/doc/cherokee/media/images/cookbook_wp5.png -share/doc/cherokee/media/images/cookbook_wp_default1.png -share/doc/cherokee/media/images/cookbook_wp_example1.png -share/doc/cherokee/media/images/cookbook_wp_example2.png -share/doc/cherokee/media/images/cookbook_wp_example3.png +share/doc/cherokee/media/images/cookbook_zend1.png +share/doc/cherokee/media/images/other_graphs_conns.png +share/doc/cherokee/media/images/other_graphs_logging.png +share/doc/cherokee/media/images/other_graphs_timeouts.png +share/doc/cherokee/media/images/other_graphs_traffic.png share/doc/cherokee/media/images/proxy_phase1.png share/doc/cherokee/media/images/proxy_phase2.png share/doc/cherokee/media/images/tracelor.png @@ -834,9 +1018,9 @@ share/doc/cherokee/modules_handlers_custom_error.html share/doc/cherokee/modules_handlers_dbslayer.html share/doc/cherokee/modules_handlers_dirlist.html +share/doc/cherokee/modules_handlers_empty_gif.html share/doc/cherokee/modules_handlers_fcgi.html share/doc/cherokee/modules_handlers_file.html -share/doc/cherokee/modules_handlers_mirror.html share/doc/cherokee/modules_handlers_proxy.html share/doc/cherokee/modules_handlers_redir.html share/doc/cherokee/modules_handlers_scgi.html @@ -844,11 +1028,11 @@ share/doc/cherokee/modules_handlers_server_info.html share/doc/cherokee/modules_handlers_ssi.html share/doc/cherokee/modules_handlers_streaming.html +share/doc/cherokee/modules_handlers_uwsgi.html share/doc/cherokee/modules_loggers.html share/doc/cherokee/modules_loggers_combined.html share/doc/cherokee/modules_loggers_custom.html share/doc/cherokee/modules_loggers_ncsa.html -share/doc/cherokee/modules_loggers_w3c.html share/doc/cherokee/modules_validators.html share/doc/cherokee/modules_validators_authlist.html share/doc/cherokee/modules_validators_htdigest.html @@ -859,8 +1043,10 @@ share/doc/cherokee/modules_validators_plain.html share/doc/cherokee/other.html share/doc/cherokee/other_community.html +share/doc/cherokee/other_errors.html share/doc/cherokee/other_faq.html share/doc/cherokee/other_goodies.html +share/doc/cherokee/other_graphs.html share/doc/cherokee/other_signals.html share/examples/cherokee/ share/examples/cherokee/etc/ @@ -868,7 +1054,6 @@ share/examples/cherokee/etc/cherokee.conf @sample ${SYSCONFDIR}/cherokee/cherokee.conf share/examples/cherokee/etc/cherokee.conf.perf_sample -share/examples/cherokee/etc/ssl/ @sample ${SYSCONFDIR}/cherokee/ssl/ share/examples/cherokee/www/ @sample /var/cherokee/ @@ -885,7 +1070,11 @@ @sample /var/cherokee/index.html @sample /var/cherokee/cgi-bin/ @owner _cherokee +...@sample /var/db/cherokee/ +...@sample /var/db/cherokee/graphs/ +...@sample /var/db/cherokee/graphs/images/ @sample /var/log/cherokee/ @sample /var/log/cherokee/cherokee.access @sample /var/log/cherokee/cherokee.error +...@extraunexec rm -rf /var/db/cherokee @extraunexec rm -rf /var/log/cherokee -- Antoine