diff options
| author |   Matteo Bernardini <ponce@slackbuilds.org> | 2012-09-08 09:10:52 +0200 |
|---|---|---|
| committer |   Robby Workman <rworkman@slackbuilds.org> | 2012-09-08 17:27:21 -0500 |
| commit | a51e47323f61855e557323b94a96e9ec37208c08 (patch) | |
| tree | a549a88ef3fb7a5ebc8bb57558c9f5d0f10672fc /network/cherokee/patches | |
| parent | a154033cb8e1970ee9f5060b6aaaf22c33aa4a07 (diff) | |
| download | slackbuilds-a51e47323f61855e557323b94a96e9ec37208c08.tar.gz slackbuilds-a51e47323f61855e557323b94a96e9ec37208c08.tar.xz | |
network/cherokee: Updated for version 1.2.101.
Also forced /var/log/cherokee and run with a dedicated user,
various cleanups and additions to the README.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network/cherokee/patches')
| -rw-r--r-- | network/cherokee/patches/cherokee-1.2.98-linux3.patch | 45 | ||||
| -rw-r--r-- | network/cherokee/patches/log_storing.patch | 29 |
2 files changed, 74 insertions, 0 deletions
diff --git a/network/cherokee/patches/cherokee-1.2.98-linux3.patch b/network/cherokee/patches/cherokee-1.2.98-linux3.patch new file mode 100644 index 0000000000..e1e335264b --- /dev/null +++ b/network/cherokee/patches/cherokee-1.2.98-linux3.patch @@ -0,0 +1,45 @@ +diff -Naur cherokee-1.2.98.orig/admin/SystemStats.py cherokee-1.2.98/admin/SystemStats.py +--- cherokee-1.2.98.orig/admin/SystemStats.py 2011-05-03 18:01:41.000000000 +0900 ++++ cherokee-1.2.98/admin/SystemStats.py 2011-08-26 13:05:08.128851462 +0900 +@@ -39,7 +39,7 @@ + global _stats + + if not _stats: +- if sys.platform == 'linux2': ++ if sys.platform == 'linux2' or sys.platform == 'linux3': + _stats = System_stats__Linux() + elif sys.platform == 'darwin': + _stats = System_stats__Darwin() +diff -Naur cherokee-1.2.98.orig/admin/market/InstallUtil.py cherokee-1.2.98/admin/market/InstallUtil.py +--- cherokee-1.2.98.orig/admin/market/InstallUtil.py 2011-05-03 18:01:41.000000000 +0900 ++++ cherokee-1.2.98/admin/market/InstallUtil.py 2011-08-26 13:05:06.596844132 +0900 +@@ -56,7 +56,7 @@ + first_group = str(root_group) + + # Systems +- if sys.platform == 'linux2': ++ if sys.platform == 'linux2' or sys.platform == 'linux3': + if os.getuid() == 0: + return root_group + return first_group +@@ -72,7 +72,7 @@ + + + def current_UID_is_admin(): +- if sys.platform == 'linux2': ++ if sys.platform == 'linux2' or sys.platform == 'linux3': + return os.getuid() == 0 + elif sys.platform == 'darwin': + return os.getuid() == 0 +diff -Naur cherokee-1.2.98.orig/admin/util.py cherokee-1.2.98/admin/util.py +--- cherokee-1.2.98.orig/admin/util.py 2011-03-31 17:30:04.000000000 +0900 ++++ cherokee-1.2.98/admin/util.py 2011-08-26 13:05:04.622834682 +0900 +@@ -341,7 +341,7 @@ + def os_get_document_root(): + if sys.platform == 'darwin': + return "/Library/WebServer/Documents" +- elif sys.platform == 'linux2': ++ elif sys.platform == 'linux2' or sys.platform == 'linux3': + if os.path.exists ("/etc/redhat-release"): + return '/var/www' + elif os.path.exists ("/etc/fedora-release"): diff --git a/network/cherokee/patches/log_storing.patch b/network/cherokee/patches/log_storing.patch new file mode 100644 index 0000000000..878492a756 --- /dev/null +++ b/network/cherokee/patches/log_storing.patch @@ -0,0 +1,29 @@ +diff -Naur cherokee-1.2.101.orig/admin/configured.py.pre cherokee-1.2.101/admin/configured.py.pre +--- cherokee-1.2.101.orig/admin/configured.py.pre 2011-10-12 20:07:44.000000000 +0200 ++++ cherokee-1.2.101/admin/configured.py.pre 2012-09-08 08:25:28.694838641 +0200 +@@ -22,7 +22,7 @@ + CHEROKEE_DATADIR = join (DATADIR, "cherokee") + CHEROKEE_DEPSDIR = join (DATADIR, "cherokee/deps") + CHEROKEE_CONFDIR = join (SYSCONFDIR, "cherokee") +-CHEROKEE_VAR_LOG = join (LOCALSTATE, "log") ++CHEROKEE_VAR_LOG = join (LOCALSTATE, "log/cherokee") + CHEROKEE_VAR_RUN = join (LOCALSTATE, "run") + CHEROKEE_VAR_LIB = join (LOCALSTATE, "lib/cherokee") + CHEROKEE_RRD_DIR = join (LOCALSTATE, "lib/cherokee/graphs") +diff -Naur cherokee-1.2.101.orig/cherokee.conf.sample.pre cherokee-1.2.101/cherokee.conf.sample.pre +--- cherokee-1.2.101.orig/cherokee.conf.sample.pre 2011-10-12 20:07:44.000000000 +0200 ++++ cherokee-1.2.101/cherokee.conf.sample.pre 2012-09-08 08:25:17.512923553 +0200 +@@ -27,11 +27,11 @@ + + 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!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 |