--- nanoweb-2.2.9.orig/debian/nanoweb-doc.dirs +++ nanoweb-2.2.9/debian/nanoweb-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/nanoweb-doc/html --- nanoweb-2.2.9.orig/debian/nanoweb.docs +++ nanoweb-2.2.9/debian/nanoweb.docs @@ -0,0 +1,2 @@ +README +CREDITS --- nanoweb-2.2.9.orig/debian/nanoweb-contrib.README.Debian +++ nanoweb-2.2.9/debian/nanoweb-contrib.README.Debian @@ -0,0 +1,16 @@ +nanoweb-contrib for Ubuntu +-------------------------- + +The following user contributed utilities are available: + +1. apache2nwconf - converts Apache's configuration to Nanoweb format (for + further details see 'man apache2nwconf') + +2. cgi-nanoweb-wrapper.php - a wrapper script to run Nanoweb below Apache + (for further details see the script itself: + /usr/share/nanoweb-contrib/cgi-nanoweb-wrapper.php) + +3. mkhugenanoweb.php - merge config and modules into nanoweb.php (for + further details see 'man mkhugenanoweb.php') + + -- Szilveszter Farkas (Phanatic) , Fri, 13 Jan 2006 16:52:05 +0100 --- nanoweb-2.2.9.orig/debian/nanoweb.postrm +++ nanoweb-2.2.9/debian/nanoweb.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ -h /var/www/nanoweb ]; then + rm /var/www/nanoweb +fi + +#DEBHELPER# --- nanoweb-2.2.9.orig/debian/control +++ nanoweb-2.2.9/debian/control @@ -0,0 +1,63 @@ +Source: nanoweb +Section: web +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Szilveszter Farkas (Phanatic) +Build-Depends: debhelper (>= 5.0.7), quilt (>= 0.4.0) +Standards-Version: 3.6.2 +Homepage: http://nanoweb.si.kz/ + +Package: nanoweb +Architecture: all +Depends: php5-cli, php5-cgi, php5-mysql, mime-support +Recommends: nanoweb-doc (= ${binary:Version}) +Suggests: lynx, nanoweb-nanoconfig (= ${binary:Version}), nanoweb-contrib (= ${binary:Version}) +Description: HTTP server written in PHP + Nanoweb is an HTTP server written in PHP, designed to be small, secure, and + extensible. + . + It is distributed under the terms of the GNU General Public License. + . + Nanoweb's main features are : + - HTTP/1.1 compliance + - Powerful and easy configuration + - Modular architecture + - FastCGI, CGI and Server side includes support + - Name and port based virtual hosts + - Access control lists + - htpasswd, MySQL, PostgreSQL and LDAP authentication support + - Themes for server generated content + - Apache compatible log format, MySQL logging + - Directory browsing + - inetd support and SSL via external helpers + - Denial of Service protection + - Proxy Server extension + - Filters and gzip support + - RBL support (mail-abuse.org) + - Extension Protocols (request methods) support + - ... and a lot more + +Package: nanoweb-nanoconfig +Architecture: all +Depends: nanoweb (= ${binary:Version}) +Description: web-based configuration for a Nanoweb server + With the help of this tool, you can easily configure your Nanoweb server + through a web interface. + . + Intended to use by beginners, experts should avoid it for security reasons + (world writable config files). + +Package: nanoweb-doc +Architecture: all +Section: doc +Description: documentation for Nanoweb + Manual and READMEs for Nanoweb. + +Package: nanoweb-contrib +Architecture: all +Depends: nanoweb (= ${binary:Version}), php5-cli +Description: user contributed utilities for Nanoweb + User contributed utilities for Nanoweb including: + - An Apache to Nanoweb configuration converter (apache2nwconf) + - A wrapper script to run Nanoweb below Apache (cgi-nanoweb-wrapper.php) + - A monolithic Nanoweb creator (mkhugenanoweb.php) --- nanoweb-2.2.9.orig/debian/rules +++ nanoweb-2.2.9/debian/rules @@ -0,0 +1,128 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +include /usr/share/quilt/quilt.make + +configure: configure-stamp patch + +configure-stamp: + dh_testdir + + touch configure-stamp + +#Architecture +build: build-indep build-stamp + +build-stamp: $(QUILT_STAMPFN) + +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp + + touch build-indep-stamp + +clean: distclean unpatch + +distclean: + dh_testdir + dh_testroot + rm -f build-indep-stamp configure-stamp + + dh_clean + +install: install-indep +install-indep: + dh_testdir + dh_testroot + dh_clean -i + dh_installdirs -i + + # build nanoweb-doc + cp $(CURDIR)/docs/README.* $(CURDIR)/debian/nanoweb-doc/usr/share/doc/nanoweb-doc/ + rm $(CURDIR)/debian/nanoweb-doc/usr/share/doc/nanoweb-doc/README.windows + cp $(CURDIR)/docs/manual/* $(CURDIR)/debian/nanoweb-doc/usr/share/doc/nanoweb-doc/html/ + + # build nanoweb + mkdir -p $(CURDIR)/debian/nanoweb/usr/bin + mkdir -p $(CURDIR)/debian/nanoweb/usr/sbin + + cp $(CURDIR)/src/htpasswd.php $(CURDIR)/debian/nanoweb/usr/bin/htpasswd.nanoweb + cp $(CURDIR)/src/in.nanoweb $(CURDIR)/debian/nanoweb/usr/sbin/ + cp $(CURDIR)/src/nanoctl $(CURDIR)/debian/nanoweb/usr/sbin/ + cp $(CURDIR)/src/nanoweb.php $(CURDIR)/debian/nanoweb/usr/sbin/nanoweb + + cp $(CURDIR)/conf/nanoweb.conf $(CURDIR)/debian/nanoweb/etc/nanoweb/ + cp $(CURDIR)/conf/modules.conf $(CURDIR)/debian/nanoweb/etc/nanoweb/ + cp $(CURDIR)/conf/vhosts.conf $(CURDIR)/debian/nanoweb/etc/nanoweb/ + + cp $(CURDIR)/conf/*.theme $(CURDIR)/debian/nanoweb/usr/share/nanoweb/themes/ + + cp $(CURDIR)/modules/* $(CURDIR)/debian/nanoweb/usr/lib/nanoweb/modules/ + chmod 755 $(CURDIR)/debian/nanoweb/usr/lib/nanoweb/modules/ + + cp $(CURDIR)/www/default/* $(CURDIR)/debian/nanoweb/usr/share/nanoweb/defaultroot/ + cp $(CURDIR)/ChangeLog $(CURDIR)/debian/nanoweb/usr/share/nanoweb/defaultroot/ + cp $(CURDIR)/README $(CURDIR)/debian/nanoweb/usr/share/nanoweb/defaultroot/ + + cp $(CURDIR)/www/icons/* $(CURDIR)/debian/nanoweb/usr/share/nanoweb/icons/ + + cp -rf $(CURDIR)/www/vhosts/* $(CURDIR)/debian/nanoweb/usr/share/nanoweb/vhosts/ + + # build nanoweb-nanoconfig + cp $(CURDIR)/www/nanoconfig/* $(CURDIR)/debian/nanoweb-nanoconfig/usr/share/nanoweb-nanoconfig/ + cp $(CURDIR)/www/nanoconfig/.nwaccess $(CURDIR)/debian/nanoweb-nanoconfig/usr/share/nanoweb-nanoconfig/ + + # build nanoweb-contrib + mkdir -p $(CURDIR)/debian/nanoweb-contrib/usr/bin + + cp $(CURDIR)/contrib/apache2nwconf $(CURDIR)/debian/nanoweb-contrib/usr/bin/ + cp $(CURDIR)/contrib/mkhugenanoweb.php $(CURDIR)/debian/nanoweb-contrib/usr/bin/mkhugenanoweb + cp $(CURDIR)/contrib/cgi-nanoweb-wrapper.php $(CURDIR)/debian/nanoweb-contrib/usr/share/nanoweb-contrib/ + chmod -x $(CURDIR)/debian/nanoweb-contrib/usr/share/nanoweb-contrib/cgi-nanoweb-wrapper.php + + # rename some man pages to be consistent with the new script names + mv $(CURDIR)/docs/man/man1/htpasswd.php.1.gz $(CURDIR)/docs/man/man1/htpasswd.nanoweb.1.gz + mv $(CURDIR)/docs/man/man1/mkhugenanoweb.php.1.gz $(CURDIR)/docs/man/man1/mkhugenanoweb.1.gz + mv $(CURDIR)/docs/man/man8/nanoweb.php.8.gz $(CURDIR)/docs/man/man8/nanoweb.8.gz + + dh_install -i +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installinit + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: configure build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +binary: binary-indep +binary-arch: build +.PHONY: build clean binary-indep binary install install-indep configure --- nanoweb-2.2.9.orig/debian/nanoweb.manpages +++ nanoweb-2.2.9/debian/nanoweb.manpages @@ -0,0 +1,5 @@ +docs/man/man1/htpasswd.nanoweb.1.gz +docs/man/man5/nanoweb.conf.5.gz +docs/man/man8/in.nanoweb.8.gz +docs/man/man8/nanoctl.8.gz +docs/man/man8/nanoweb.8.gz --- nanoweb-2.2.9.orig/debian/nanoweb.init.d +++ nanoweb-2.2.9/debian/nanoweb.init.d @@ -0,0 +1,175 @@ +#!/bin/sh +# +# Nanoweb start/stop script - by Vincent Negrier +# +### BEGIN INIT INFO +# Provides: nanoweb +# Required-Start: $local_fs $time +# Required-Stop: $local_fs $time +# Should-Start: $network +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: HTTP server +### END INIT INFO + +SERV='/usr/sbin/nanoweb' +CONF='/etc/nanoweb/nanoweb.conf' + +SRVBN=$(basename $SERV) +PIDFILE=`grep -i pidfile $CONF |cut -d= -f2 |cut -c2-` +SRVPORT=`grep -i listenport $CONF |head -1 |cut -d= -f2 |cut -c2-` + +BROWSER='lynx' + +is_running () { + + if [ -f "$PIDFILE" ]; then + + return 0; + + else + + return 1; + + fi + +} + +nw_start () { + + echo -n "Starting nanoweb http server: " + + if is_running; then + + echo "already running, use restart option instead"; + + else + + $SERV --config=$CONF --start-daemon --quiet + + if [ $? -eq 0 ]; then + + echo "$SRVBN" + + fi + + fi + +} + +nw_stop () { + + echo -n "Stopping nanoweb http server: " + + if is_running; then + + kill `cat $PIDFILE` >/dev/null 2>/dev/null + sleep 1 + rm -f $PIDFILE + echo "$SRVBN" + + else + + echo "not running"; + + fi + +} + +nw_reload () { + + echo -n "Reloading nanoweb http server: " + + if is_running; then + + kill -HUP `cat $PIDFILE` >/dev/null 2>/dev/null + echo "$SRVBN"; + + else + + echo "not running, use start option instead"; + + fi + +} + +nw_configtest () { + + $SERV --config=$CONF --config-test + +} + +nw_status () { + + if is_running; then + + $BROWSER -dump http://localhost:$SRVPORT/server-status?$QSTRING + + else + + echo "Server is not running" + + fi + +} + +case "$1" in + + start) + nw_start; + ;; + + stop) + nw_stop; + ;; + + force-reload) + nw_reload; + ;; + + reload) + nw_reload; + ;; + + restart) + nw_stop; + sleep 1 + nw_start; + ;; + + configtest) + nw_configtest; + ;; + + status) + QSTRING="$2" + nw_status; + ;; + + *) + echo "Usage: nanoctl [ options ]" + echo "" + echo "available options" + echo "" + echo "start : start the server" + echo "stop : stop the server" + echo "restart : stop and start the server" + echo "reload : reload server configuration" + echo "configtest : test configuration and exit" + echo "" + echo "status options (available only if mod_status is loaded into the server)" + echo "" + echo "status : show server status summary" + echo "status who : show active server processes status" + echo "status detailed : show detailed server status" + echo "status vstats : show vhosts quick stats" + echo "status xml : output xml document" + echo "status wddx : output wddx encoded packet" + echo "status php-serialize : output php serialize()d string" + echo "" + echo "detailed, vstats, xml, wddx, php-serialize can be mixed using the - separator" + echo "" + ;; + +esac --- nanoweb-2.2.9.orig/debian/compat +++ nanoweb-2.2.9/debian/compat @@ -0,0 +1 @@ +5 --- nanoweb-2.2.9.orig/debian/nanoweb-contrib.manpages +++ nanoweb-2.2.9/debian/nanoweb-contrib.manpages @@ -0,0 +1,2 @@ +docs/man/man1/apache2nwconf.1.gz +docs/man/man1/mkhugenanoweb.1.gz --- nanoweb-2.2.9.orig/debian/changelog +++ nanoweb-2.2.9/debian/changelog @@ -0,0 +1,34 @@ +nanoweb (2.2.9-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #261158) + * debian/nanoweb.init.d: Add LSB header, replace == with -eq in start + function, fixing warning + * debian/rules: Remove extensions from nanoweb.php and htpasswd.php (now + installed as htpasswd.nanoweb to avoid conflicts), to comply with policy + on script naming. Also rename manpages to their corresponding names + * debian/control: Needs to depend on php5-mysql + * debian/rules, debian/patches/*: Move to quilt instead of hacky rules + + -- Iain Lane Wed, 27 Aug 2008 23:56:10 +0100 + +nanoweb (2.2.8-0ubuntu2) gutsy; urgency=low + + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Martin Pitt Wed, 15 Aug 2007 08:08:23 +0000 + +nanoweb (2.2.8-0ubuntu1) edgy; urgency=low + + * New upstream release. + + -- Szilveszter Farkas (Phanatic) Wed, 23 Aug 2006 13:23:00 +0200 + +nanoweb (2.2.7-0ubuntu1) dapper; urgency=low + + * Initial release. + * debian/patches/*.patch: + - correct paths for Debian-based systems + + -- Szilveszter Farkas (Phanatic) Fri, 13 Jan 2006 16:52:05 +0100 + --- nanoweb-2.2.9.orig/debian/nanoweb.dirs +++ nanoweb-2.2.9/debian/nanoweb.dirs @@ -0,0 +1,9 @@ +usr/lib/nanoweb/modules +usr/share/nanoweb/defaultroot +usr/share/nanoweb/icons +usr/share/nanoweb/themes +usr/share/nanoweb/vhosts +etc/nanoweb +var/log/nanoweb +var/www + --- nanoweb-2.2.9.orig/debian/nanoweb-nanoconfig.dirs +++ nanoweb-2.2.9/debian/nanoweb-nanoconfig.dirs @@ -0,0 +1 @@ +usr/share/nanoweb-nanoconfig --- nanoweb-2.2.9.orig/debian/nanoweb.README.Debian +++ nanoweb-2.2.9/debian/nanoweb.README.Debian @@ -0,0 +1,27 @@ +Nanoweb for Ubuntu +------------------ + +1. Enabling inetd + + WARNING! This is an option, but the authors suggest to use the default + standalone version. + + First insert these lines into /etc/inetd.conf: + www stream tcp nowait root /usr/sbin/in.nanoweb nanoweb + http stream tcp nowait root /usr/sbin/in.nanoweb nanoweb -ssl + + After that edit /etc/nanoweb/nanoweb.conf, and change the following line: + ServerMode = standalone + to this: + ServerMode = inetd + + Finally restart the services: + $ sudo /etc/init.d/inetd restart + $ sudo /etc/init.d/nanoweb restart + +2. More information + + For further options please see the Nanoweb User's Guide (manual): install the + nanoweb-doc package. + + -- Szilveszter Farkas (Phanatic) , Fri, 13 Jan 2006 16:52:05 +0100 --- nanoweb-2.2.9.orig/debian/nanoweb-contrib.dirs +++ nanoweb-2.2.9/debian/nanoweb-contrib.dirs @@ -0,0 +1 @@ +usr/share/nanoweb-contrib --- nanoweb-2.2.9.orig/debian/NEWS.Debian +++ nanoweb-2.2.9/debian/NEWS.Debian @@ -0,0 +1,6 @@ +nanoweb (2.2.9-0ubuntu1) intrepid; urgency=low + + The htpasswd.php program previously installed by nanoweb is now known as + htpasswd.nanoweb. This brings the package in line with policy. + + -- Iain Lane Mon, 25 Aug 2008 19:11:19 +0100 --- nanoweb-2.2.9.orig/debian/copyright +++ nanoweb-2.2.9/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Szilveszter Farkas on +Fri, 13 Jan 2006 16:52:05 +0100. + +It was downloaded from http://nanoweb.si.kz/ + +Upstream Authors: Vincent Negrier + Mario Salzer + myrdin + Szilveszter Farkas (Phanatic) + splif + +Copyright (C) 2002-2005 Vincent Negrier aka. sIX + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- nanoweb-2.2.9.orig/debian/watch +++ nanoweb-2.2.9/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://nanoweb.si.kz/downloads/dist/nanoweb_(.*)\.tgz --- nanoweb-2.2.9.orig/debian/nanoweb-nanoconfig.README.Debian +++ nanoweb-2.2.9/debian/nanoweb-nanoconfig.README.Debian @@ -0,0 +1,13 @@ +Enabling nanoconfig +------------------- + +Remove the comment mark (#) from the following line in /etc/nanoweb/nanoweb.conf: +#Alias = /nanoconfig/ /usr/share/nanoweb-nanoconfig/ +It should look like this: +Alias = /nanoconfig/ /usr/share/nanoweb-nanoconfig/ +When this is done, reload Nanoweb: +$ sudo /etc/init.d/nanoweb reload +Now you can browse to http://localhost/nanoconfig/nanoconfig.php and you should +see the nanoconfig interface. + + -- Szilveszter Farkas (Phanatic) , Fri, 13 Jan 2006 16:52:05 +0100 --- nanoweb-2.2.9.orig/debian/nanoweb-doc.README.Debian +++ nanoweb-2.2.9/debian/nanoweb-doc.README.Debian @@ -0,0 +1,12 @@ +Enabling manual browsing +------------------------ + +Remove the comment mark (#) from the following line in /etc/nanoweb/nanoweb.conf: +#Alias = /manual/ /usr/share/doc/nanoweb-doc/html/ +It should look like this: +Alias = /manual/ /usr/share/doc/nanoweb-doc/html/ +When this is done, reload Nanoweb: +$ sudo /etc/init.d/nanoweb reload +Now you can browse to http://localhost/manual/ and you should see the Nanoweb manual. + + -- Szilveszter Farkas (Phanatic) , Fri, 13 Jan 2006 16:52:05 +0100 --- nanoweb-2.2.9.orig/debian/nanoweb.postinst +++ nanoweb-2.2.9/debian/nanoweb.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +# create symlinks +ln -s /usr/share/nanoweb/defaultroot/ /var/www/nanoweb + +# chown logdir +chown www-data:www-data /var/log/nanoweb + +#DEBHELPER# --- nanoweb-2.2.9.orig/debian/patches/conffiles.patch +++ nanoweb-2.2.9/debian/patches/conffiles.patch @@ -0,0 +1,82 @@ +Index: nanoweb-2.2.9/conf/nanoweb.conf +=================================================================== +--- nanoweb-2.2.9.orig/conf/nanoweb.conf 2008-08-25 19:39:05.461655307 +0100 ++++ nanoweb-2.2.9/conf/nanoweb.conf 2008-08-25 19:41:03.061654521 +0100 +@@ -63,9 +63,9 @@ + + # The LoadTheme directive loads a server theme file and register it for use + # with ServerTheme +-LoadTheme = default.theme +-LoadTheme = nanoweb.theme +-#LoadTheme = fancy.theme ++LoadTheme = /usr/share/nanoweb/themes/default.theme ++LoadTheme = /usr/share/nanoweb/themes/nanoweb.theme ++#LoadTheme = /usr/share/nanoweb/themes/fancy.theme + + # Defines which server theme will be used to render internal content. This + # directive can be used here, by vhost or in access files +@@ -73,7 +73,7 @@ + ServerTheme = nanoweb + + # Location of your mime types file +-MimeTypes = /etc/nanoweb/mime.types ++MimeTypes = /etc/mime.types + + # Uncomment this to disable fallback to automatic mime type guessing + #DisableMimeMagic = 1 +@@ -90,9 +90,9 @@ + # the CLI interpreter. + ParseExt = shtml SSI + ParseExt = cgi CGI $SCRIPT_FILENAME +-ParseExt = php CGI /usr/local/bin/php-cgi +-ParseExt = php3 CGI /usr/local/bin/php-cgi +-ParseExt = php4 CGI /usr/local/bin/php-cgi ++ParseExt = php CGI /usr/bin/php-cgi ++ParseExt = php3 CGI /usr/bin/php-cgi ++ParseExt = php4 CGI /usr/bin/php-cgi + #ParseExt = asis asis + #ParseExt = bsp BSP text/html + #ParseExt = pl CGI /usr/bin/perl $SCRIPT_FILENAME +@@ -131,8 +131,7 @@ + # have a symbolic link pointing there ? If needed, use AllowSymlinkTo to + # provide a list of allowed targets for symbolic links. To allow all symbolic + # links, use "AllowSymlinkTo = /". +-AllowSymlinkTo = /usr/lib/nanoweb/defaultroot/ +-AllowSymlinkTo = /usr/lib/nanoweb/nanoconfig/ ++AllowSymlinkTo = /usr/share/nanoweb/defaultroot/ + + # If AllowPathInfo is enabled, nanoweb will allow URLs like this one : + # http://www.example.com/script.php/arg1/arg2 +@@ -202,7 +201,7 @@ + LogDir = /var/log/nanoweb + + # Default site configuration +-DocumentRoot = /var/www/localhost ++DocumentRoot = /var/www/nanoweb + DirectoryIndex = index.php index.html + #DirectoryIndex = index.html /var/www/browse-dir.php + Log = access.log +@@ -215,8 +214,9 @@ + # Declaration of aliased directory names. Syntax is : + # Alias = /virtualpath/ /real/path/ + #Alias = /doc/ /usr/share/doc/ +-Alias = /doc/nanoweb/ /usr/share/doc/nanoweb/ +-Alias = /icons/ /usr/lib/nanoweb/icons/ ++#Alias = /manual/ /usr/share/doc/nanoweb-doc/html/ ++#Alias = /nanoconfig/ /usr/share/nanoweb-nanoconfig/ ++Alias = /icons/ /usr/share/nanoweb/icons/ + + # Add server variables, this can be used to set constants for your scripts, or + # to set some app specific vars like REDIRECT_STATUS for PHP. +Index: nanoweb-2.2.9/conf/vhosts.conf +=================================================================== +--- nanoweb-2.2.9.orig/conf/vhosts.conf 2008-08-25 19:39:05.477654730 +0100 ++++ nanoweb-2.2.9/conf/vhosts.conf 2008-08-25 19:41:03.065654967 +0100 +@@ -4,6 +4,6 @@ + [www.cgidemo.com] + ServerAlias = www1.cgidemo.com + ServerAlias = www2.cgidemo.com +-DocumentRoot = /usr/lib/nanoweb/vhosts/www.cgidemo.com ++DocumentRoot = /usr/share/nanoweb/vhosts/www.cgidemo.com + Log = access_www.cgidemo.com + [/www.cgidemo.com] --- nanoweb-2.2.9.orig/debian/patches/series +++ nanoweb-2.2.9/debian/patches/series @@ -0,0 +1,5 @@ +conffiles.patch +contrib.patch +defaultwww.patch +nanoconfig.patch +source.patch --- nanoweb-2.2.9.orig/debian/patches/contrib.patch +++ nanoweb-2.2.9/debian/patches/contrib.patch @@ -0,0 +1,20 @@ +Index: nanoweb-2.2.9/contrib/apache2nwconf +=================================================================== +--- nanoweb-2.2.9.orig/contrib/apache2nwconf 2008-08-25 19:39:05.413654968 +0100 ++++ nanoweb-2.2.9/contrib/apache2nwconf 2008-08-25 19:41:04.005154503 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/php -q ++#!/usr/bin/php -q + +
+- You should now edit the configuration file and also have a look at the manual.
++ You should now edit the configuration file and also have a look at the manual.
+
+- You may also use nanoconfig to set up the server.

++ You may also use nanoconfig to set up the server.

+ For anything else, visit the nanoweb home on the web or mail the author. +


+ +

+

+- poweredbyNANOWEB ++ poweredbyNANOWEB +
+ + --- nanoweb-2.2.9.orig/debian/patches/nanoconfig.patch +++ nanoweb-2.2.9/debian/patches/nanoconfig.patch @@ -0,0 +1,39 @@ +Index: nanoweb-2.2.9/www/nanoconfig/nanoconfig-de.php +=================================================================== +--- nanoweb-2.2.9.orig/www/nanoconfig/nanoconfig-de.php 2008-08-25 19:39:05.221655547 +0100 ++++ nanoweb-2.2.9/www/nanoconfig/nanoconfig-de.php 2008-08-25 19:41:04.589684603 +0100 +@@ -33,7 +33,7 @@ + "%-Gzip Encoding" => "-Komprimierung", + "%-Authentication" => "-Authentifizierung", + "%Virtual Hosts" => "Virtuelle Server", +- "@nanoweb" => 'nanoweb logo'." ++ "@nanoweb" => 'nanoweb logo'." + Dieses Programm dient einer schnellen Erstkonfiguration + von nanoweb. In aller Regel ist es jedoch einfacher + die Konfigurationsdateien von Hand zu editieren (sehr +Index: nanoweb-2.2.9/www/nanoconfig/nanoconfig-en.php +=================================================================== +--- nanoweb-2.2.9.orig/www/nanoconfig/nanoconfig-en.php 2008-08-25 19:39:05.233654967 +0100 ++++ nanoweb-2.2.9/www/nanoconfig/nanoconfig-en.php 2008-08-25 19:41:04.589684603 +0100 +@@ -4,7 +4,7 @@ + # this file is the fallback and thus always required! + + $directive_descriptions["NW"] = array( +- "@nanoweb" => 'nanoweb logo ' ++ "@nanoweb" => 'nanoweb logo ' + ."This tool is intended for quick initial setup of nanoweb. + It is often much easier and faster to edit the + well documented configuration files and it is in +Index: nanoweb-2.2.9/www/nanoconfig/nanoconfig-fr.php +=================================================================== +--- nanoweb-2.2.9.orig/www/nanoconfig/nanoconfig-fr.php 2008-08-25 19:39:05.277665768 +0100 ++++ nanoweb-2.2.9/www/nanoconfig/nanoconfig-fr.php 2008-08-25 19:41:04.589684603 +0100 +@@ -8,7 +8,7 @@ + + #-- translated directives help + $directive_descriptions["NW"] = array( +- "@nanoweb" => 'nanoweb logo'." ++ "@nanoweb" => 'nanoweb logo'." + Cet outil permet une configuration rapide de nanoweb. + Il est souvent plus facile et plus rapide d'éditer les + fichiers de configuration, et il est en fait impossible --- nanoweb-2.2.9.orig/debian/patches/source.patch +++ nanoweb-2.2.9/debian/patches/source.patch @@ -0,0 +1,33 @@ +Index: nanoweb-2.2.9/src/htpasswd.php +=================================================================== +--- nanoweb-2.2.9.orig/src/htpasswd.php 2008-08-25 19:39:05.097655506 +0100 ++++ nanoweb-2.2.9/src/htpasswd.php 2008-08-25 19:41:04.861694844 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/php -q ++#!/usr/bin/php -q +