File nostromo-1.9.2.patch of Package nostromo
diff -uNr nostromo-1.9.2/ChangeLog nostromo-1.9.2.new/ChangeLog
--- nostromo-1.9.2/ChangeLog 2009-08-04 16:02:14.000000000 -0500
+++ nostromo-1.9.2.new/ChangeLog 2009-08-11 13:04:17.000000000 -0500
@@ -366,7 +366,7 @@
0.2
===
-- changed default configfile path to /var/nostromo/conf/nhttpd.conf
+- changed default configfile path to /var/lib/nostromo/conf/nhttpd.conf
- chdir/chroot will directly done after reading the configfile successfully
- SIGPIPE, SIGHUP, SIGQUIT, SIGALRM will be silently ignored now and don't
generate a server log anymore
diff -uNr nostromo-1.9.2/conf/nhttpd.conf-dist nostromo-1.9.2.new/conf/nhttpd.conf-dist
--- nostromo-1.9.2/conf/nhttpd.conf-dist 2009-06-27 13:32:32.000000000 -0500
+++ nostromo-1.9.2.new/conf/nhttpd.conf-dist 2009-08-11 13:04:17.000000000 -0500
@@ -5,9 +5,9 @@
serverlisten *
#serverlisten 81.221.21.250 127.0.0.1 ::1
serveradmin webmaster@nazgul.ch
-serverroot /var/nostromo
+serverroot /var/lib/nostromo
servermimes conf/mimes
-docroot /var/nostromo/htdocs
+docroot /var/lib/nostromo/htdocs
docindex index.html
# LOGS [OPTIONAL]
@@ -22,7 +22,7 @@
# BASIC AUTHENTICATION [OPTIONAL]
#htaccess .htaccess
-#htpasswd /var/nostromo/conf/.htpasswd
+#htpasswd /var/lib/nostromo/conf/.htpasswd
#htpasswd +bsdauth
#htpasswd +bsdauthnossl
@@ -42,12 +42,12 @@
# ALIASES [OPTIONAL]
-/icons /var/nostromo/icons
+/icons /var/lib/nostromo/icons
# VIRTUAL HOSTS [OPTIONAL]
-#www.rahel.ch /var/nostromo/htdocs/www.rahel.ch
-#www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch
+#www.rahel.ch /var/lib/nostromo/htdocs/www.rahel.ch
+#www.rahel.ch:8080 /var/lib/nostromo/htdocs/www.rahel.ch
# HOMEDIRS [OPTIONAL]
diff -uNr nostromo-1.9.2/GNUmakefile nostromo-1.9.2.new/GNUmakefile
--- nostromo-1.9.2/GNUmakefile 2006-07-08 05:17:24.000000000 -0500
+++ nostromo-1.9.2.new/GNUmakefile 2009-08-11 13:04:18.000000000 -0500
@@ -8,25 +8,25 @@
/usr/share/man/man8/nhttpd.8
install -c -o root -g bin -m 555 src/tools/crypt \
/usr/local/sbin/crypt
- install -d -o root -g daemon -m 755 /var/nostromo/conf
- install -d -o root -g daemon -m 755 /var/nostromo/htdocs
- install -d -o root -g daemon -m 755 /var/nostromo/htdocs/cgi-bin
- install -d -o root -g daemon -m 755 /var/nostromo/icons
- install -d -o root -g daemon -m 755 /var/nostromo/logs
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/conf
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/htdocs
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/htdocs/cgi-bin
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/icons
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/logs
install -c -o root -g bin -m 555 htdocs/cgi-bin/printenv \
- /var/nostromo/htdocs/cgi-bin/printenv
+ /var/lib/nostromo/htdocs/cgi-bin/printenv
install -c -o root -g bin -m 644 conf/mimes \
- /var/nostromo/conf/mimes
+ /var/lib/nostromo/conf/mimes
install -c -o root -g bin -m 644 conf/nhttpd.conf-dist \
- /var/nostromo/conf/nhttpd.conf-dist
+ /var/lib/nostromo/conf/nhttpd.conf-dist
install -c -o root -g bin -m 644 htdocs/index.html \
- /var/nostromo/htdocs/index.html
+ /var/lib/nostromo/htdocs/index.html
install -c -o root -g bin -m 644 htdocs/nostromo.gif \
- /var/nostromo/htdocs/nostromo.gif
+ /var/lib/nostromo/htdocs/nostromo.gif
install -c -o root -g bin -m 644 icons/dir.gif \
- /var/nostromo/icons/dir.gif
+ /var/lib/nostromo/icons/dir.gif
install -c -o root -g bin -m 644 icons/file.gif \
- /var/nostromo/icons/file.gif
+ /var/lib/nostromo/icons/file.gif
clean:
cd src; ${MAKE} clean
diff -uNr nostromo-1.9.2/Makefile nostromo-1.9.2.new/Makefile
--- nostromo-1.9.2/Makefile 2006-01-25 04:27:45.000000000 -0500
+++ nostromo-1.9.2.new/Makefile 2009-08-11 13:04:17.000000000 -0500
@@ -1,24 +1,24 @@
SUBDIR+= src
afterinstall:
- install -d -o root -g daemon -m 755 /var/nostromo/conf
- install -d -o root -g daemon -m 755 /var/nostromo/htdocs
- install -d -o root -g daemon -m 755 /var/nostromo/htdocs/cgi-bin
- install -d -o root -g daemon -m 755 /var/nostromo/icons
- install -d -o root -g daemon -m 755 /var/nostromo/logs
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/conf
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/htdocs
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/htdocs/cgi-bin
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/icons
+ install -d -o root -g daemon -m 755 /var/lib/nostromo/logs
install -c -o root -g bin -m 555 htdocs/cgi-bin/printenv \
- /var/nostromo/htdocs/cgi-bin/printenv
+ /var/lib/nostromo/htdocs/cgi-bin/printenv
install -c -o root -g bin -m 644 conf/mimes \
- /var/nostromo/conf/mimes
+ /var/lib/nostromo/conf/mimes
install -c -o root -g bin -m 644 conf/nhttpd.conf-dist \
- /var/nostromo/conf/nhttpd.conf-dist
+ /var/lib/nostromo/conf/nhttpd.conf-dist
install -c -o root -g bin -m 644 htdocs/index.html \
- /var/nostromo/htdocs/index.html
+ /var/lib/nostromo/htdocs/index.html
install -c -o root -g bin -m 644 htdocs/nostromo.gif \
- /var/nostromo/htdocs/nostromo.gif
+ /var/lib/nostromo/htdocs/nostromo.gif
install -c -o root -g bin -m 644 icons/dir.gif \
- /var/nostromo/icons/dir.gif
+ /var/lib/nostromo/icons/dir.gif
install -c -o root -g bin -m 644 icons/file.gif \
- /var/nostromo/icons/file.gif
+ /var/lib/nostromo/icons/file.gif
.include <bsd.subdir.mk>
diff -uNr nostromo-1.9.2/src/nhttpd/main.c nostromo-1.9.2.new/src/nhttpd/main.c
--- nostromo-1.9.2/src/nhttpd/main.c 2009-06-27 13:32:32.000000000 -0500
+++ nostromo-1.9.2.new/src/nhttpd/main.c 2009-08-11 13:04:18.000000000 -0500
@@ -54,7 +54,7 @@
* global vars local
*/
static int ppid;
-static const char *configfile = "/var/nostromo/conf/nhttpd.conf";
+static const char *configfile = "/var/lib/nostromo/conf/nhttpd.conf";
/*
* global vars extern
diff -uNr nostromo-1.9.2/src/nhttpd/nhttpd.8 nostromo-1.9.2.new/src/nhttpd/nhttpd.8
--- nostromo-1.9.2/src/nhttpd/nhttpd.8 2009-06-27 13:32:32.000000000 -0500
+++ nostromo-1.9.2.new/src/nhttpd/nhttpd.8 2009-08-11 13:04:18.000000000 -0500
@@ -85,7 +85,7 @@
Uses
.Ar configfile
as configuration file. If this option is not set,
-.Ar /var/nostromo/conf/nhttpd.conf
+.Ar /var/lib/nostromo/conf/nhttpd.conf
will be used by default.
.El
.Sh SETUID
@@ -205,7 +205,7 @@
just add the following line in your
.Ar configfile :
.Bd -literal -offset indent
-/icons /var/nostromo/icons
+/icons /var/lib/nostromo/icons
.Ed
.Sh VIRTUAL HOSTS
To serve virtual hosts, just add a line for each virtual host in
@@ -214,8 +214,8 @@
.Ar docroot
of that virtual host, as in this example:
.Bd -literal -offset indent
-www.rahel.ch /var/nostromo/htdocs/www.rahel.ch
-www.nazgul.ch:81 /var/nostromo/htdocs/www.nazgul.ch
+www.rahel.ch /var/lib/nostromo/htdocs/www.rahel.ch
+www.nazgul.ch:81 /var/lib/nostromo/htdocs/www.nazgul.ch
.Ed
.Pp
For each virtual host a separate access_log is written automatically with
@@ -247,14 +247,14 @@
.Ar homedirs_public
option.
.Sh FILES
-.Bl -tag -width "/var/nostromo/conf/nhttpd.conf" -compact
-.It Pa /var/nostromo/conf/nhttpd.conf
+.Bl -tag -width "/var/lib/nostromo/conf/nhttpd.conf" -compact
+.It Pa /var/lib/nostromo/conf/nhttpd.conf
server configuration
-.It Pa /var/nostromo/conf/mimes
+.It Pa /var/lib/nostromo/conf/mimes
mime types
-.It Pa /var/nostromo/logs/nhttpd.pid
+.It Pa /var/lib/nostromo/logs/nhttpd.pid
pid file
-.It Pa /var/nostromo/logs/access_log
+.It Pa /var/lib/nostromo/logs/access_log
http log
.It Pa /usr/local/sbin/crypt
create user with DES password
