[csw-devel] SF.net SVN: gar:[13517] csw/mgar/pkg/lighttpd/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Mar 2 02:45:38 CET 2011
Revision: 13517
http://gar.svn.sourceforge.net/gar/?rev=13517&view=rev
Author: wahwah
Date: 2011-03-02 01:45:38 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
lighttpd: It passes the smoke test now
Using SMF integration, running as the lighttpd user. Deploying a default
configuration file.
Modified Paths:
--------------
csw/mgar/pkg/lighttpd/trunk/Makefile
csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd
Added Paths:
-----------
csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf
Removed Paths:
-------------
csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall
csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove
Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-01 22:31:34 UTC (rev 13516)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-03-02 01:45:38 UTC (rev 13517)
@@ -16,7 +16,8 @@
endef
MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+DISTFILES += cswlighttpd
PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
@@ -46,6 +47,10 @@
# because modules are not supposed to be in /opt/csw/lib.
libdir = $(prefix)/lib/lighttpd
+# Solaris Zones support
+sysconfdir = /etc$(prefix)
+localstatedir = /var$(prefix)
+
CONFIGURE_ARGS = $(DIRPATHS)
# Solaris 9 does not have IPV6_V6ONLY.
@@ -59,4 +64,31 @@
# One test is still failing.
TEST_TARGET = check
+INITSMF = $(sysconfdir)/init\.d/cswlighttpd
+PRESERVECONF = $(sysconfdir)/lighttpd\.conf
+USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup
+
+# To allow lighttpd to write logs
+PROTOTYPE_MODIFIERS = user
+PROTOTYPE_FILES_user = $(localstatedir)/log/lighttpd
+PROTOTYPE_USER_user = lighttpd
+PROTOTYPE_GROUP_user = lighttpd
+PROTOTYPE_CLASS_user = ugfiles
+
include gar/category.mk
+
+post-install-modulated:
+ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d
+ ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(DESTDIR)$(sysconfdir)/init.d
+ # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(DESTDIR)$(sysconfdir)
+ # gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf
+ ginstall -m 644 $(FILEDIR)/lighttpd.conf $(DESTDIR)$(sysconfdir)
+ gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf
+ ginstall -d -m 755 $(DESTDIR)$(localstatedir)/run
+ ginstall -d -m 755 $(DESTDIR)$(datadir)/lighttpd-root
+ echo 'lighttpd is working!' > $(DESTDIR)$(datadir)/lighttpd-root/index.html
+ ginstall -d -m 755 $(DESTDIR)$(localstatedir)/log/lighttpd
+ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(NAME)
+ echo "lighttpd:lighttpd:lighttpd web server::::" \
+ > $(DESTDIR)$(sysconfdir)/pkg/$(NAME)/cswusergroup
+ @$(MAKECOOKIE)
Deleted: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall 2011-03-01 22:31:34 UTC (rev 13516)
+++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.postinstall 2011-03-02 01:45:38 UTC (rev 13517)
@@ -1,71 +0,0 @@
-# lighttpd - postinstall script
-#
-if [ "$PKG_INSTALL_ROOT" = "" ]
-then
- PKG_INSTALL_ROOT=/
- CONFDIR="/opt/csw/etc"
-else
- CONFDIR="$PKG_INSTALL_ROOT/opt/csw/etc"
-fi
-
-# daemons are started by default
-enable_daemon=yes
-
-# Source csw.conf, if it exists
-if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
-fi
-if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-fi
-
-# If defined, autoenable for the specific daemon name takes precedence
-if [ "$autoenable_lighttpd" = "no" ] ; then
- enable_daemon=no
-elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_lighttpd" ] ; then
- enable_daemon=no
-fi
-
-# We don't want to overwrite the lighttpd.conf the user may have already installed
-case "$autoenable_demons" in
- ""|"yes")
- if [ ! -f $CONFDIR/lighttpd.conf ]; then
- echo copying default template lighttpd.conf.CSW to lighttpd.conf
- cp -p $CONFDIR/lighttpd.conf.CSW $CONFDIR/lighttpd.conf
- else
- echo lighttpd.conf already exists. Not copying lighttpd.conf.CSW
- fi
- ;;
-esac
-
-# Set variable smf depending on the availability of SMF binaries
-smf=no
-if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then
- smf=yes
-fi
-
-# let's add lighttpd to the smf framework if necessary (we won't enable it yet)
-if [ $smf = yes ]; then
- echo "Configuring service in SMF"
- /usr/sbin/svccfg import /opt/csw/var/svc/manifest/network/lighttpd.xml >/dev/null 2>&1
- /usr/sbin/svcadm disable svc:network/lighttpd >/dev/null 2>&1
- echo "Lighttpd is using Service Management Facility."
- echo " The FMRI is: svc:network/lighttpd"
-fi
-
-if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi
-
-# Let's enable the daemon (if necessary)
-if [ "$enable_daemon" = "yes" -a "$PKG_INSTALL_ROOT" = "/" ]; then
- echo "Starting lighttpd"
- if [ $smf = no ]; then
- /etc/init.d/cswlighttpd start >/dev/null 2>&1
- else
- /usr/sbin/svcadm enable svc:network/lighttpd >/dev/null 2>&1
- fi
-fi
-
-# FIXES: https://www.opencsw.org/mantis/view.php?id=4574
-crle -l /usr/lib:/lib:/opt/csw/gcc4/lib
-
-exit 0
Deleted: csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove 2011-03-01 22:31:34 UTC (rev 13516)
+++ csw/mgar/pkg/lighttpd/trunk/files/CSWlighttpd.preremove 2011-03-02 01:45:38 UTC (rev 13517)
@@ -1,29 +0,0 @@
-# lighttpd - preremove script
-# Stop lighttpd if it is running.
-CONFFILE=$CONFDIR/lighttpd.conf
-if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi
-
-smf=no
-if [ -f $PKG_ROOT_DIR/usr/sbin/svccfg -a -f $PKG_ROOT_DIR/usr/sbin/svcadm ] ; then smf=yes ; fi
-
-if [ $smf = yes ]
-then
- /usr/sbin/svcadm disable -s svc:network/lighttpd >/dev/null 2>&1
- /usr/sbin/svccfg delete svc:network/lighttpd >/dev/null 2>&1
-else
- case "$PKG_ROOT_DIR" in
- "/")
- test -x /etc/init.d/cswlighttpd && /etc/init.d/cswlighttpd stop
- ;;
- esac
-fi
-
-# Remove lighttpd.conf if necessary
-if cmp $CONFFILE $CONFFILE.CSW >/dev/null ; then
- echo "$CONFFILE unchanged from default. Removing it."
- rm $CONFFILE
-else
- echo "$CONFFILE has been modified. Leaving it as-is."
-fi
-
-exit 0
Modified: csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-01 22:31:34 UTC (rev 13516)
+++ csw/mgar/pkg/lighttpd/trunk/files/cswlighttpd 2011-03-02 01:45:38 UTC (rev 13517)
@@ -7,8 +7,8 @@
#
LIGHTTPD_HOME=/opt/csw
-CONF_FILE=/opt/csw/etc/lighttpd.conf
-PIDFILE=/var/run/lighttpd.pid
+CONF_FILE=/etc/opt/csw/lighttpd.conf
+PIDFILE=/var/opt/csw/run/lighttpd.pid
HTTPD="${LIGHTTPD_HOME}/sbin/lighttpd"
[ ! -f ${CONF_FILE} ] && exit $CONF_FILE
Added: csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf (rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/files/lighttpd.conf 2011-03-02 01:45:38 UTC (rev 13517)
@@ -0,0 +1,325 @@
+# lighttpd configuration file
+#
+# use it as a base for lighttpd 1.0.0 and above
+#
+# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $
+
+############ Options you really have to take care of ####################
+
+## modules to load
+# at least mod_access and mod_accesslog should be loaded
+# all other module should only be loaded if really neccesary
+# - saves some time
+# - saves memory
+server.modules = (
+# "mod_rewrite",
+# "mod_redirect",
+# "mod_alias",
+ "mod_access",
+# "mod_cml",
+# "mod_trigger_b4_dl",
+# "mod_auth",
+# "mod_status",
+# "mod_setenv",
+# "mod_fastcgi",
+# "mod_proxy",
+# "mod_simple_vhost",
+# "mod_evhost",
+# "mod_userdir",
+# "mod_cgi",
+# "mod_compress",
+# "mod_ssi",
+# "mod_usertrack",
+# "mod_expire",
+# "mod_secdownload",
+# "mod_rrdtool",
+ "mod_accesslog" )
+
+# READ: http://blogs.sun.com/shanti/entry/lighttpd_on_solaris
+server.event-handler = "solaris-devpoll"
+
+## a static document-root, for virtual-hosting take look at the
+## server.virtual-* options
+server.document-root = "/opt/csw/share/lighttpd-root"
+
+## where to send error-messages to
+server.errorlog = "/var/opt/csw/log/lighttpd/error.log"
+
+# files to check for if .../ is requested
+index-file.names = ( "index.php", "index.html",
+ "index.htm", "default.htm" )
+
+## set the event-handler (read the performance section in the manual)
+# server.event-handler = "freebsd-kqueue" # needed on OS X
+
+# mimetype mapping
+mimetype.assign = (
+ ".pdf" => "application/pdf",
+ ".sig" => "application/pgp-signature",
+ ".spl" => "application/futuresplash",
+ ".class" => "application/octet-stream",
+ ".ps" => "application/postscript",
+ ".torrent" => "application/x-bittorrent",
+ ".dvi" => "application/x-dvi",
+ ".gz" => "application/x-gzip",
+ ".pac" => "application/x-ns-proxy-autoconfig",
+ ".swf" => "application/x-shockwave-flash",
+ ".tar.gz" => "application/x-tgz",
+ ".tgz" => "application/x-tgz",
+ ".tar" => "application/x-tar",
+ ".zip" => "application/zip",
+ ".mp3" => "audio/mpeg",
+ ".m3u" => "audio/x-mpegurl",
+ ".wma" => "audio/x-ms-wma",
+ ".wax" => "audio/x-ms-wax",
+ ".ogg" => "application/ogg",
+ ".wav" => "audio/x-wav",
+ ".gif" => "image/gif",
+ ".jpg" => "image/jpeg",
+ ".jpeg" => "image/jpeg",
+ ".png" => "image/png",
+ ".xbm" => "image/x-xbitmap",
+ ".xpm" => "image/x-xpixmap",
+ ".xwd" => "image/x-xwindowdump",
+ ".css" => "text/css",
+ ".html" => "text/html",
+ ".htm" => "text/html",
+ ".js" => "text/javascript",
+ ".asc" => "text/plain",
+ ".c" => "text/plain",
+ ".cpp" => "text/plain",
+ ".log" => "text/plain",
+ ".conf" => "text/plain",
+ ".text" => "text/plain",
+ ".txt" => "text/plain",
+ ".dtd" => "text/xml",
+ ".xml" => "text/xml",
+ ".mpeg" => "video/mpeg",
+ ".mpg" => "video/mpeg",
+ ".mov" => "video/quicktime",
+ ".qt" => "video/quicktime",
+ ".avi" => "video/x-msvideo",
+ ".asf" => "video/x-ms-asf",
+ ".asx" => "video/x-ms-asf",
+ ".wmv" => "video/x-ms-wmv",
+ ".bz2" => "application/x-bzip",
+ ".tbz" => "application/x-bzip-compressed-tar",
+ ".tar.bz2" => "application/x-bzip-compressed-tar"
+ )
+
+# Use the "Content-Type" extended attribute to obtain mime type if possible
+#mimetype.use-xattr = "enable"
+
+
+## send a different Server: header
+## be nice and keep it at lighttpd
+# server.tag = "lighttpd"
+
+#### accesslog module
+accesslog.filename = "/var/opt/csw/log/lighttpd/access.log"
+
+## deny access the file-extensions
+#
+# ~ is for backupfiles from vi, emacs, joe, ...
+# .inc is often used for code includes which should in general not be part
+# of the document-root
+url.access-deny = ( "~", ".inc" )
+
+$HTTP["url"] =~ "\.pdf$" {
+ server.range-requests = "disable"
+}
+
+##
+# which extensions should not be handle via static-file transfer
+#
+# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
+static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+
+######### Options that are good to be but not neccesary to be changed #######
+
+## bind to port (default: 80)
+#server.port = 81
+
+## bind to localhost (default: all interfaces)
+#server.bind = "grisu.home.kneschke.de"
+
+## error-handler for status 404
+#server.error-handler-404 = "/error-handler.html"
+#server.error-handler-404 = "/error-handler.php"
+
+## to help the rc.scripts
+server.pid-file = "/var/opt/csw/run/lighttpd.pid"
+
+
+###### virtual hosts
+##
+## If you want name-based virtual hosting add the next three settings and load
+## mod_simple_vhost
+##
+## document-root =
+## virtual-server-root + virtual-server-default-host + virtual-server-docroot
+## or
+## virtual-server-root + http-host + virtual-server-docroot
+##
+#simple-vhost.server-root = "/home/weigon/wwwroot/servers/"
+#simple-vhost.default-host = "grisu.home.kneschke.de"
+#simple-vhost.document-root = "/pages/"
+
+
+##
+## Format: <errorfile-prefix><status-code>.html
+## -> ..../status-404.html for 'File not found'
+#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
+
+## virtual directory listings
+#dir-listing.activate = "enable"
+
+## enable debugging
+#debug.log-request-header = "enable"
+#debug.log-response-header = "enable"
+#debug.log-request-handling = "enable"
+#debug.log-file-not-found = "enable"
+
+### only root can use these options
+#
+# chroot() to directory (default: no chroot() )
+#server.chroot = "/"
+
+## change uid to <uid> (default: don't care)
+server.username = "lighttpd"
+
+## change uid to <uid> (default: don't care)
+server.groupname = "lighttpd"
+
+#### compress module
+#compress.cache-dir = "/tmp/lighttpd/cache/compress/"
+#compress.filetype = ("text/plain", "text/html")
+
+#### proxy module
+## read proxy.txt for more info
+#proxy.server = ( ".php" =>
+# ( "localhost" =>
+# (
+# "host" => "192.168.0.101",
+# "port" => 80
+# )
+# )
+# )
+
+#### fastcgi module
+## read fastcgi.txt for more info
+## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
+#fastcgi.server = ( ".php" =>
+# ( "localhost" =>
+# (
+# "socket" => "/tmp/php-fastcgi.socket",
+# "bin-path" => "/usr/local/bin/php"
+# )
+# )
+# )
+
+#### CGI module
+#cgi.assign = ( ".pl" => "/usr/bin/perl",
+# ".cgi" => "/usr/bin/perl" )
+#
+
+#### SSL engine
+#ssl.engine = "enable"
+#ssl.pemfile = "server.pem"
+
+#### status module
+#status.status-url = "/server-status"
+#status.config-url = "/server-config"
+
+#### auth module
+## read authentication.txt for more info
+#auth.backend = "plain"
+#auth.backend.plain.userfile = "lighttpd.user"
+#auth.backend.plain.groupfile = "lighttpd.group"
+
+#auth.backend.ldap.hostname = "localhost"
+#auth.backend.ldap.base-dn = "dc=my-domain,dc=com"
+#auth.backend.ldap.filter = "(uid=$)"
+
+#auth.require = ( "/server-status" =>
+# (
+# "method" => "digest",
+# "realm" => "download archiv",
+# "require" => "user=jan"
+# ),
+# "/server-config" =>
+# (
+# "method" => "digest",
+# "realm" => "download archiv",
+# "require" => "valid-user"
+# )
+# )
+
+#### url handling modules (rewrite, redirect, access)
+#url.rewrite = ( "^/$" => "/server-status" )
+#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
+#### both rewrite/redirect support back reference to regex conditional using %n
+#$HTTP["host"] =~ "^www\.(.*)" {
+# url.redirect = ( "^/(.*)" => "http://%1/$1" )
+#}
+
+#
+# define a pattern for the host url finding
+# %% => % sign
+# %0 => domain name + tld
+# %1 => tld
+# %2 => domain name without tld
+# %3 => subdomain 1 name
+# %4 => subdomain 2 name
+#
+#evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
+
+#### expire module
+#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
+
+#### ssi
+#ssi.extension = ( ".shtml" )
+
+#### rrdtool
+#rrdtool.binary = "/usr/bin/rrdtool"
+#rrdtool.db-name = "/var/www/lighttpd.rrd"
+
+#### setenv
+#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" )
+#setenv.add-response-header = ( "X-Secret-Message" => "42" )
+
+## for mod_trigger_b4_dl
+# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
+# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
+# trigger-before-download.trigger-url = "^/trigger/"
+# trigger-before-download.download-url = "^/download/"
+# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
+# trigger-before-download.trigger-timeout = 10
+
+## for mod_cml
+## don't forget to add index.cml to server.indexfiles
+# cml.extension = ".cml"
+# cml.memcache-hosts = ( "127.0.0.1:11211" )
+
+#### variable usage:
+## variable name without "." is auto prefixed by "var." and becomes "var.bar"
+#bar = 1
+#var.mystring = "foo"
+
+## integer add
+#bar += 1
+## string concat, with integer cast as string, result: "www.foo1.com"
+#server.name = "www." + mystring + var.bar + ".com"
+## array merge
+#index-file.names = (foo + ".php") + index-file.names
+#index-file.names += (foo + ".php")
+
+#### include
+#include /etc/lighttpd/lighttpd-inc.conf
+## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
+#include "lighttpd-inc.conf"
+
+#### include_shell
+#include_shell "echo var.a=1"
+## the above is same as:
+#var.a=1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list