diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2011-08-26 11:58:08 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2011-08-26 11:58:08 +0000 |
commit | acdb6e1994d9a320fd08a7ef054eec7413266dc6 (patch) | |
tree | c009cafec32546744d6fccbace5c78b5d09529ae /www-servers | |
parent | Version bump. (diff) | |
download | historical-acdb6e1994d9a320fd08a7ef054eec7413266dc6.tar.gz historical-acdb6e1994d9a320fd08a7ef054eec7413266dc6.tar.bz2 historical-acdb6e1994d9a320fd08a7ef054eec7413266dc6.zip |
Version bumped. Added php and static-libs USE flags. Removed fastcgi USE flag. Added PYTHON_USE_WITH="theads", bug #364533. Added many fixes.
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/cherokee/ChangeLog | 10 | ||||
-rw-r--r-- | www-servers/cherokee/Manifest | 38 | ||||
-rw-r--r-- | www-servers/cherokee/cherokee-1.2.98.ebuild | 172 | ||||
-rw-r--r-- | www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch | 26 | ||||
-rw-r--r-- | www-servers/cherokee/files/cherokee-1.2.98-linux3.patch | 45 | ||||
-rw-r--r-- | www-servers/cherokee/files/cherokee-confd-1.2.98 | 4 | ||||
-rw-r--r-- | www-servers/cherokee/files/cherokee-initd-1.2.98 | 66 |
7 files changed, 344 insertions, 17 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index 5f45b35f239d..1bb6bffa82d6 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/cherokee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.84 2011/05/24 07:03:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.85 2011/08/26 11:58:08 matsuu Exp $ + +*cherokee-1.2.98 (26 Aug 2011) + + 26 Aug 2011; MATSUU Takuto <matsuu@gentoo.org> +files/cherokee-confd-1.2.98, + +files/cherokee-initd-1.2.98, +cherokee-1.2.98.ebuild, + +files/cherokee-1.2.98-gentoo.patch, +files/cherokee-1.2.98-linux3.patch: + Version bumped. Added php and static-libs USE flags. Removed fastcgi USE + flag. Added PYTHON_USE_WITH="theads", bug #364533. Added many fixes. *cherokee-1.2.2 (24 May 2011) diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest index 939958e6deac..1f0b99923bb5 100644 --- a/www-servers/cherokee/Manifest +++ b/www-servers/cherokee/Manifest @@ -1,32 +1,38 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 +AUX cherokee-1.2.98-gentoo.patch 1036 RMD160 6fd579df2edcca221e607084c45a01ef15da1385 SHA1 6f7b682e833bdb7253f1a7881f41c52b1cd6f328 SHA256 5c32626584e45871f95069f24d840d6fdd07d5542eef8273e79739330a3d4093 +AUX cherokee-1.2.98-linux3.patch 1914 RMD160 aafe83b052218dc703c22f8d30b92e2027a4baad SHA1 d101cb335ded17dd18b7ff19ada4caa74bbf9146 SHA256 cc03fa321bb01cd4a7026685ef2e3fc606fd53da056f629307c6e1904987ad1b +AUX cherokee-confd-1.2.98 144 RMD160 05e5dc30e647624c27d0ebb6015d0ca1d4278593 SHA1 e187c35650ef045f7a19b6b72b88081269774948 SHA256 48331d56dfa6743444e0b01ce4df2013b27dd30804c88365257d560cc6adcab0 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f AUX cherokee-initd-1.2.0 717 RMD160 79d5e72dabc0183ae7e8d6453d83b1e549cac736 SHA1 04efcc25ab326a695944b45e12a1057a3574181e SHA256 c6cd9b7ab782aa5f3242bbdfcefabf4fff05ea253e7af1175df5eb2da7e6255d +AUX cherokee-initd-1.2.98 1156 RMD160 4cba17ac3161b4d32be7b639dacc16966acceebb SHA1 871bb838f1f0fa4c881426e9c35b8a6557db2d98 SHA256 2af14cf2c6085c1f110ff376a4d66b08bfd6469b4e93d801dbbf4629eaf16010 DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75 DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a DIST cherokee-1.2.1.tar.gz 6041090 RMD160 d6285e8dd157b689eb1b2cd2369daf2bf812ba59 SHA1 982bc99e966218661abd562d604aea32923bfde9 SHA256 8ce6f35f521b8b0a45b5c95587b3653a137f9d8eed5ee7ffd3e8fa6cb922a668 DIST cherokee-1.2.2.tar.gz 6108853 RMD160 1fa6cd0daae90bcf79b1d4cc7e63b318fbe0ed5e SHA1 6fe2df38308cd05d1531f5d4db5198b8438b5134 SHA256 1dc3afbdb510030d5a1801e01936bc863d0b5811b512b288b46d8143a6cfc475 +DIST cherokee-1.2.98.tar.gz 6163984 RMD160 b16b981674cb0213c2d7703016cf29c28c6d2866 SHA1 3efcf8115268f8b4ff97b8dc79234a68c41905da SHA256 042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d EBUILD cherokee-1.0.12.ebuild 4157 RMD160 200c962991c6c947e234b9fa4546f1dd3d827d7d SHA1 0d4832f2361d8e83bba07b42002a7de0a9697db1 SHA256 a5c85e604e4a02ab4a20c88ebf6c7b70f01f46491fe1a4a6179f79151867a07a EBUILD cherokee-1.2.0.ebuild 4152 RMD160 c2beb0bf529e26ebfc729d0f536a0a5e4c7282c7 SHA1 fd04a0bf5e8d00cd52a0b9d3e6554164236c1036 SHA256 965f7ee1e40fde54b1f8c3a4f3da95dfae4500559a9bbab3382ab543d0b3954c EBUILD cherokee-1.2.1.ebuild 4152 RMD160 7ceeda0703cd4a3bac513ba7bdb636d11034dcc7 SHA1 51206f2a53d226fbd877e8eee03e159a80cd90b9 SHA256 923c7cbea1560abca1aedae25cd450d9d0c800a60731a29c9aed64257c4d7a37 EBUILD cherokee-1.2.2.ebuild 4155 RMD160 fc1b4231c75ca4a2026a42c37844a74d24f8bfdd SHA1 749f5eb584e5da1b586c470b2bd23331c27f5f44 SHA256 506142d95260e31854d5313c654b6eaa27612fadc05e6b7ee38704d57c776115 -MISC ChangeLog 19748 RMD160 cf073e3c94d6e03a7ccce5d60bdb55b0b68273e7 SHA1 b47f1a02ae54d442dbbf520929d28b67d683942d SHA256 d60a4187a7d71e6f2a16c4313a48965580bff2bc714d7b4a0f03649f32369051 +EBUILD cherokee-1.2.98.ebuild 4281 RMD160 f0dd7f5f104d8b7866bbb183f0289a09e80353ff SHA1 a8686f1ba7afb9bd3bafcf2d51c5efe184ce1f4d SHA256 6fc04dc05659d8ac3c98a594e248216e68599bd90f512613e9bde5dee8a2d32b +MISC ChangeLog 20133 RMD160 fd74cfaa537cb43f8ffb37f4194f3263d3652b90 SHA1 314734b7c9a32f5b676adbc0bc7d41ee6fe19e7d SHA256 ef7332b8e84c987caea00cb42ad171cc382eb74de5b8884929d9a20d85bfff07 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJN21g+AAoJEPiazRVxLXTFejEP/iP5Fxm01IRQjZ6G5/kBJPp3 -Y02TPkdRsdmySAjlLLPzpVw9BDsoGsrbam+fciFkn1FRSWy1uWLavWS8sJuw+lbw -ClBt2S7FY8Olv0kE5/o/2O1Pkm8TivrrWP8g5zQ+IxqPDfc3X2MY2IZpSQeprWrV -5plIM49mp5ZN/Du3/J4Hj+JlmJ8SGN4fsSW/3qeo8Jjd7i6gK/SggJXlElYbbPDs -7ZFQ+AjuUzkyLtMSL7x4LPCjLbojbTB3l+IrkhTkj6J+UkzLHTEoOa6VKT1OUdvl -41yQSOnpwmt4qxakNpZoDocvo3lNi8fY6S1YTfj7+rpUnSIAe8axcHv9x5kO6I+u -ouKwtH/r5jhZxjGZDhvGWFB957SPYxsmj/PtagcCqUj5qpIOO4/W/Bkj4opfC+sA -y8RwXS7vadb/5GQ6/WBGWOCQL9M9t/HVzrrsIphqZMj5Q9KBMyEW7B+tMg5K+IxR -TPFU3kgUks3MDoXrrLDW1JJmo6/k+PapZu1UMAJonmcIU5RGPxF1eCqMx37BQhWg -+hhyMiPa3vIzh1Ien7Yh0qzE9CkNatIUQlo7zQSwy8tPcbmDhzUcvqrH/doKAiIS -JpLMutSpzzR1QgqG647GqD9VcdODdGFpFX7VNjQXMappi1mGZmcOcxk1v8iI/erf -qJB73r3V+V4oJA+W22xi -=po/S +iQIcBAEBAgAGBQJOV4pZAAoJECaGw+YFKA1p6+AQAI9/XRmn5jOlOuYBHbtWNRHq +6rquYA2fpAFnzxCMkBnvxYiREHfNbQR1e7xr0Go7xCn7d8R7GC6N55SeET74AP3I +fQfozpgfG9u7tMiEiiitpWZGKgJVt69XEK4QQ2OXj9hs7b5GAsWuuTfGNzwjdRcw +EXDywFnRAmhPgLBNIObFAMov1AL06jsczgx5YiBynmmWuV2Aj4yA2pZgT2fA5RX6 +noZMHQ2kWS2+rMd8e9sRcuCfs6jTp2anFFNvlvMFn5MXdnUqVcVhiXZfifgDV7NR +GpNDjaisrTwMqBD3IrNdCSGNzxJ8Prn6GDnBAD4NSoekhWhoxaHm6PJ3ZvMSVES5 +qgqGpg9jbHQjiSXjrrP1dXU1UOeD2gDH4W1MSnnFpDqZzGszb+VsJ8ZWwHLRGP4U +mB+GNjR33Jy9EkXzulK+RXeefXww9ohcAh4l/M/wbEDh5kCfmfZQ9IiJSFSwxSMw +z4nCGBTazHt3+SFRcYs00QM8VHiePMuF7GogeHqk8oiW4OPqTk5sw77MewDbyC14 +54GWCia/z8GmJN7cTypLbYYArgC+PQzg0wQ8Oz4DzJ0ijwFZ5V9qYXrKK6CDlHcn +L96rGK+H6bxHpC3crYN+szFQK7/JOG01aZAiPf3+Gox05lR8aAhT/Jxdp0VxJYgz +KeY8hggTtlwnwH5X6m/Y +=0ubr -----END PGP SIGNATURE----- diff --git a/www-servers/cherokee/cherokee-1.2.98.ebuild b/www-servers/cherokee/cherokee-1.2.98.ebuild new file mode 100644 index 000000000000..1107dfa8e5ef --- /dev/null +++ b/www-servers/cherokee/cherokee-1.2.98.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.98.ebuild,v 1.1 2011/08/26 11:58:08 matsuu Exp $ + +EAPI="3" +PYTHON_DEPEND="admin? 2" +PYTHON_USE_WITH="threads" + +inherit eutils multilib pam python versionator + +DESCRIPTION="An extremely fast and tiny web server." +SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz" +HOMEPAGE="http://www.cherokee-project.com/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs" + +COMMON_DEPEND="dev-libs/libpcre + >=sys-libs/zlib-1.1.4-r1 + ffmpeg? ( virtual/ffmpeg ) + geoip? ( dev-libs/geoip ) + ldap? ( net-nds/openldap ) + mysql? ( >=virtual/mysql-5 ) + nls? ( virtual/libintl ) + pam? ( virtual/pam ) + php? ( || ( + dev-lang/php[fpm] + dev-lang/php[cgi] + ) ) + ssl? ( dev-libs/openssl )" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${COMMON_DEPEND} + rrdtool? ( net-analyzer/rrdtool )" + +RESTRICT="test" + +pkg_setup() { + python_pkg_setup + + python_set_active_version 2 + + enewgroup cherokee + enewuser cherokee -1 -1 /var/www cherokee +} + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-gentoo.patch" \ + "${FILESDIR}/${P}-linux3.patch" + + python_convert_shebangs -r 2 . +} + +src_configure() { + local myconf + + if use admin ; then + myconf="${myconf} --enable-admin --with-python=$(PYTHON -2)" + else + myconf="${myconf} --disable-admin --without-python" + fi + + # Uses autodetect because --with-php requires path to php-{fpm,cgi}. + if ! use php ; then + myconf="${myconf} --without-php" + fi + + if use static ; then + myconf="${myconf} --enable-static-module=all" + fi + + local os="Unknown" + case "${CHOST}" in + *-freebsd*) + os="FreeBSD" ;; + *-netbsd*) + os="NetBSD" ;; + *-openbsd*) + os="OpenBSD" ;; + *) + os="Linux" ;; + esac + + # This make cherokee 1.2 sad + # $(use_enable threads pthread) \ + econf \ + $(use_enable debug trace) \ + $(use_enable debug backtraces) \ + $(use_enable ipv6) \ + $(use_enable kernel_linux epoll) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_enable static-libs static) \ + $(use_with ffmpeg) \ + $(use_with geoip) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with ssl libssl) \ + --disable-dependency-tracking \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-os-string="Gentoo ${os}" \ + --enable-tmpdir="${EPREFIX}/var/tmp" \ + --localstatedir="${EPREFIX}/var" \ + --with-wwwroot="${EPREFIX}/var/www/localhost/htdocs" \ + --with-cgiroot="${EPREFIX}/var/www/localhost/cgi-bin" \ + --with-wwwuser=cherokee \ + --with-wwwgroup=cherokee \ + ${myconf} || die "configure failed" +} + +src_test() { + emake test || die +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + if ! use static-libs ; then + find "${ED}" -name '*.la' -delete || die + elif ! use static ; then + find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die + fi + + dodoc AUTHORS ChangeLog README || die + + use pam && pamd_mimic system-auth cherokee auth account session + + newinitd "${FILESDIR}/${PN}-initd-${PV}" ${PN} || die "newinitd ${PN} failed" + newconfd "${FILESDIR}/${PN}-confd-${PV}" ${PN} || die "newconfd ${PN} failed" + + if ! use admin ; then + rm -r \ + "${ED}"/usr/bin/cherokee-admin-launcher \ + "${ED}"/usr/bin/CTK-run \ + "${ED}"/usr/sbin/cherokee-admin \ + "${ED}"/usr/share/cherokee/admin + fi + + exeinto /usr/share/doc/${PF}/contrib + doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} + + keepdir /var/www/localhost/htdocs /var/log/cherokee + fowners cherokee:cherokee /var/log/cherokee + + if ! use coverpage ; then + rm -rf "${ED}"/var/www/localhost/htdocs/* + fi +} + +pkg_postinst() { + if use admin ; then + python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/" + echo + elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090" + echo + else + echo + elog "Try USE=admin if you want an easy way to configure cherokee." + echo + fi + elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}." + echo +} + +pkg_postrm() { + if use admin ; then + python_mod_cleanup "${EPREFIX}/usr/share/cherokee/admin/" + fi +} diff --git a/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch b/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch new file mode 100644 index 000000000000..cc547e9118d6 --- /dev/null +++ b/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch @@ -0,0 +1,26 @@ +diff -Naur cherokee-1.2.98.orig/cherokee.conf.sample.pre cherokee-1.2.98/cherokee.conf.sample.pre +--- cherokee-1.2.98.orig/cherokee.conf.sample.pre 2011-05-03 18:01:42.000000000 +0900 ++++ cherokee-1.2.98/cherokee.conf.sample.pre 2011-08-25 17:51:33.615130274 +0900 +@@ -18,6 +18,8 @@ + server!server_tokens = full + server!panic_action = %prefix%/bin/cherokee-panic + server!pid_file = %localstatedir%/run/cherokee.pid ++server!user = cherokee ++server!group = cherokee + + # Default virtual server + # +@@ -27,11 +29,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 diff --git a/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch new file mode 100644 index 000000000000..e1e335264b6c --- /dev/null +++ b/www-servers/cherokee/files/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/www-servers/cherokee/files/cherokee-confd-1.2.98 b/www-servers/cherokee/files/cherokee-confd-1.2.98 new file mode 100644 index 000000000000..62e7fd64f787 --- /dev/null +++ b/www-servers/cherokee/files/cherokee-confd-1.2.98 @@ -0,0 +1,4 @@ +# /etc/conf.d/cherokee: config file for /etc/init.d/cherokee + +#CHEROKEE_OPTS="--config=/etc/cherokee/cherokee.conf --valgrind" +CHEROKEE_OPTS="" diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.98 b/www-servers/cherokee/files/cherokee-initd-1.2.98 new file mode 100644 index 000000000000..9c4136f24938 --- /dev/null +++ b/www-servers/cherokee/files/cherokee-initd-1.2.98 @@ -0,0 +1,66 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +opts="${ops} configtest graceful reload" + +CHEROKEE="/usr/sbin/cherokee" + +depend() { + need net + use dns ldap logger mysql netmount +} + +checkconfig() { + ${CHEROKEE} -t 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your config:" + ${CHEROKEE} -t ${CHEROKEE_OPTS} + fi + return $? +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +start() { + checkconfig || return 1 + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet \ + --exec ${CHEROKEE} -- -d ${CHEROKEE_OPTS} + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet \ + --exec ${CHEROKEE} + eend $? +} + +graceful() { + checkconfig || return 1 + + ebegin "Gracefully restarting ${SVCNAME}" + start-stop-daemon \ + --exec ${CHEROKEE} \ + --signal HUP + eend $? +} + +reload() { + checkconfig || return 1 + + ebegin "Restarting ${SVCNAME} and closing all open connections" + start-stop-daemon \ + --exec ${CHEROKEE} \ + --signal USR1 + eend $? +} |