diff options
Diffstat (limited to 'network/monkey')
| -rw-r--r-- | network/monkey/README | 8 | ||||
| -rw-r--r-- | network/monkey/config_values_fix.patch | 74 | ||||
| -rw-r--r-- | network/monkey/doinst.sh | 3 | ||||
| -rw-r--r-- | network/monkey/monkey.SlackBuild | 45 | ||||
| -rw-r--r-- | network/monkey/monkey.info | 6 | ||||
| -rw-r--r-- | network/monkey/monkey.logrotate | 12 |
6 files changed, 25 insertions, 123 deletions
diff --git a/network/monkey/README b/network/monkey/README index 6902348b4f..cf9a3edcdf 100644 --- a/network/monkey/README +++ b/network/monkey/README @@ -1,7 +1,7 @@ -Monkey is a lightweight and powerful web server and development ostack for -GNU/Linux. - +Monkey is a lightweight and powerful web server and development stack for +Linux & OSX. + It has been designed to be very scalable with low memory and CPU consumption, -the perfect solution for embedded devices. Made for ARM, x86 and x64. +the perfect solution for embedded devices. Made for ARM, x86 and x64. By default, monkey will use the "apache" user and group accounts. diff --git a/network/monkey/config_values_fix.patch b/network/monkey/config_values_fix.patch deleted file mode 100644 index 58b17da6d8..0000000000 --- a/network/monkey/config_values_fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ruN monkey-1.5.6/configure monkey-1.5.6.new/configure ---- monkey-1.5.6/configure 2015-03-03 00:52:16.000000000 +0300 -+++ monkey-1.5.6.new/configure 2015-03-13 11:51:55.984045498 +0300 -@@ -903,17 +903,17 @@ - - create_banana_script() - { -- cat > bin/banana << EOF -+ cat > bin/rc.monkey << EOF - #!/bin/sh - # --# Monkey HTTP Daemon - Banana Script -+# Monkey HTTP Daemon - rc.monkey Script - # ----------------------------------- - # This script allow you to control monkey. Written by Eduardo Silva - # ---------------------------- - # Date : 2002/09/01. - # ---------------------------- - # --# Use: ./banana OPTION -+# Use: ./rc.monkey OPTION - # - # Options available to banana: - # -@@ -1000,16 +1000,16 @@ - exit 0 - ;; - *) -- echo "Use : banana [start|stop|restart|status|help]" -+ echo "Use : \$0 [start|stop|restart|status|help]" - exit 1 - ;; - esac - done --echo "Use : banana [start|stop|restart|status|help]" -+echo "Use : \$0 [start|stop|restart|status|help]" - - exit 0 - EOF -- chmod 755 bin/banana -+ chmod 755 bin/rc.monkey - } - - #---------------------------# -diff -ruN monkey-1.5.6/lang/en/mconf monkey-1.5.6.new/lang/en/mconf ---- monkey-1.5.6/lang/en/mconf 2015-03-03 00:52:16.000000000 +0300 -+++ monkey-1.5.6.new/lang/en/mconf 2015-03-13 11:52:36.464045763 +0300 -@@ -66,7 +66,7 @@ - # For security reasons, sometimes people want to hide the version of his - # own webserver to clients (values on/off). - -- HideVersion off -+ HideVersion on - - - # Resume: -@@ -124,7 +124,7 @@ - # -------- - # Allow request to symbolic link files. - -- SymLink Off -+ SymLink On - - # TransportLayer: - # --------------- -diff -ruN monkey-1.5.6/plugins/cgi/conf/cgi.conf monkey-1.5.6.new/plugins/cgi/conf/cgi.conf ---- monkey-1.5.6/plugins/cgi/conf/cgi.conf 2015-03-03 00:52:16.000000000 +0300 -+++ monkey-1.5.6.new/plugins/cgi/conf/cgi.conf 2015-03-13 11:41:34.654041430 +0300 -@@ -19,4 +19,4 @@ - Match /cgi-bin/.*\.cgi - - # Execute PHP scripts through php-cgi interpreter: -- Match /.*\.php /usr/bin/php-cgi application/x-httpd-php -+ #Match /.*\.php /usr/bin/php-cgi application/x-httpd-php diff --git a/network/monkey/doinst.sh b/network/monkey/doinst.sh index d0a8d815f0..6c9210dab5 100644 --- a/network/monkey/doinst.sh +++ b/network/monkey/doinst.sh @@ -27,13 +27,10 @@ config etc/logrotate.d/monkey.new config etc/monkey/monkey.conf.new config etc/monkey/plugins.load.new config etc/monkey/sites/default.new -config etc/monkey/plugins/auth/monkey.users.new -config etc/monkey/plugins/cgi/cgi.conf.new config etc/monkey/plugins/cheetah/cheetah.conf.new config etc/monkey/plugins/dirlisting/dirhtml.conf.new config etc/monkey/plugins/fastcgi/fastcgi.conf.new config etc/monkey/plugins/logger/logger.conf.new config etc/monkey/plugins/mandril/mandril.conf.new -config var/www/monkey/404.html.new config var/www/monkey/favicon.ico.new config var/www/monkey/index.html.new diff --git a/network/monkey/monkey.SlackBuild b/network/monkey/monkey.SlackBuild index efbb0094e0..d6e1dbb404 100644 --- a/network/monkey/monkey.SlackBuild +++ b/network/monkey/monkey.SlackBuild @@ -29,13 +29,13 @@ # and libev script by Šime Ramov <s@ramov.com> PRGNAM=monkey -VERSION=${VERSION:-1.5.6} +VERSION=${VERSION:-1.6.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,24 +75,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 --verbose -i $CWD/config_values_fix.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib${LIBDIRSUFFIX}/monkey \ --mandir=/usr/man \ --sysconfdir=/etc/monkey \ - --datadir=/var/www/monkey \ + --webroot=/var/www/monkey \ --logdir=/var/log/monkey \ - --pidfile=/var/run/monkey/monkey.pid \ + --pidfile=monkey/monkey.pid \ --malloc-libc \ - --bindir=/usr/sbin \ - --plugdir=/usr/lib${LIBDIRSUFFIX}/monkey \ + --sbindir=/usr/sbin \ --default-port=80 \ - --default-user=apache \ - --safe-free + --default-user=apache make make install DESTDIR=$PKG @@ -103,9 +99,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# out of the box logging is disabled (and looks like this part in configure script is broken), +# out of the box logging is disabled, # enable it to audit http server's life -sed -i 's/# Load \/usr\/lib\/monkey\/monkey\-logger\.so/Load \/usr\/lib\/monkey\/monkey\-logger\.so/g' $PKG/etc/monkey/plugins.load +sed -i "s|# Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|g" $PKG/etc/monkey/plugins.load # make log dir mkdir -p $PKG/var/log/monkey @@ -115,32 +111,25 @@ mkdir -p $PKG/var/run/monkey # move init script to it's dir mkdir -p $PKG/etc/rc.d -mv $PKG/usr/sbin/rc.monkey $PKG/etc/rc.d/rc.monkey.new - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION -install -m 644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +install -Dpm 0644 monkey.init $PKG/etc/rc.d/rc.monkey.new -mkdir -p $PKG/etc/logrotate.d -install -m 644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new +install -Dpm 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp -a README.md LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION +install -Dpm 0644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new mv $PKG/etc/monkey/monkey.conf $PKG/etc/monkey/monkey.conf.new mv $PKG/etc/monkey/plugins.load $PKG/etc/monkey/plugins.load.new mv $PKG/etc/monkey/sites/default $PKG/etc/monkey/sites/default.new -mv $PKG/etc/monkey/plugins/auth/monkey.users $PKG/etc/monkey/plugins/auth/monkey.users.new -mv $PKG/etc/monkey/plugins/cgi/cgi.conf $PKG/etc/monkey/plugins/cgi/cgi.conf.new mv $PKG/etc/monkey/plugins/cheetah/cheetah.conf $PKG/etc/monkey/plugins/cheetah/cheetah.conf.new mv $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf.new mv $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf.new mv $PKG/etc/monkey/plugins/logger/logger.conf $PKG/etc/monkey/plugins/logger/logger.conf.new mv $PKG/etc/monkey/plugins/mandril/mandril.conf $PKG/etc/monkey/plugins/mandril/mandril.conf.new -mv $PKG/var/www/monkey/404.html $PKG/var/www/monkey/404.html.new mv $PKG/var/www/monkey/favicon.ico $PKG/var/www/monkey/favicon.ico.new mv $PKG/var/www/monkey/index.html $PKG/var/www/monkey/index.html.new -mkdir -p $PKG/install -install -m 644 $CWD/slack-desc $PKG/install/slack-desc -install -m 644 $CWD/doinst.sh $PKG/install/doinst.sh +install -Dpm 0644 $CWD/slack-desc $PKG/install/slack-desc +install -Dpm 0644 $CWD/doinst.sh $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/monkey/monkey.info b/network/monkey/monkey.info index 517862ec2f..079b2763c6 100644 --- a/network/monkey/monkey.info +++ b/network/monkey/monkey.info @@ -1,8 +1,8 @@ PRGNAM="monkey" -VERSION="1.5.6" +VERSION="1.6.9" HOMEPAGE="http://monkey-project.com/" -DOWNLOAD="http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz" -MD5SUM="9699e4c9ea6ce6b989907c252ae80254" +DOWNLOAD="http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz" +MD5SUM="c401734985a936ee07dbff5eca7d176a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/monkey/monkey.logrotate b/network/monkey/monkey.logrotate index 77e606aa75..438f310fae 100644 --- a/network/monkey/monkey.logrotate +++ b/network/monkey/monkey.logrotate @@ -1,17 +1,7 @@ /var/log/monkey/*.log { - su apache apache rotate 10 notifempty compress delaycompress - sharedscripts - postrotate -# kill -HUP `cat /var/run/monkey/monkey.pid.*` -# Handling of SIGHUP is not implemented yet, but they promise make it like apache httpd - PATH=/usr/sbin:/sbin:/usr/bin:/bin - pgrep -u apache -x monkey 1>/dev/null 2>/dev/null - if [ $? != '0' ]; then - /etc/rc.d/rc.monkey restart - fi - endscript + copytruncate } |