head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2;
locks; strict;
comment	@# @;


1.2
date	2011.04.01.19.10.59;	author nox;	state Exp;
branches;
next	1.1;

1.1
date	2011.03.26.19.12.11;	author nox;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 2.0 .
@
text
@--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@@@ -1,31 +1,36 @@@@
 nobase_dist_noinst_DATA = \
     tntnet/tntnet.conf.in \
-    init.d/tntnet.in
+    init.d/tntnet.in \
+    tntnet/mime.conf
 
 nobase_sysconf_DATA = \
-    tntnet/tntnet.conf \
-    init.d/tntnet
+    tntnet/tntnet.conf.sample \
+    tntnet/tntnet
 
 nobase_dist_sysconf_DATA = \
-    tntnet/mime.conf
+    tntnet/mime.conf.sample
 
 nobase_nodist_sysconf_DATA = \
-    tntnet/tntnet.properties
+    tntnet/tntnet.properties.sample
+
+tntnet/mime.conf.sample: tntnet/mime.conf
+	cp tntnet/mime.conf $@@
 
-tntnet/tntnet.conf: tntnet/tntnet.conf.in
+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in
 	sed -e 's,@@libdir\@@,@@libdir@@,g;' \
 	    -e 's,@@pkglibdir\@@,@@pkglibdir@@,g;' \
 	    -e 's,@@sysconfdir\@@,@@sysconfdir@@,g;' \
 	    -e 's,@@localstatedir\@@,@@localstatedir@@,g;' \
-		-e 's,@@datadir\@@,@@datadir@@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf
+		-e 's,@@datadir\@@,@@datadir@@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample
 
-init.d/tntnet: init.d/tntnet.in
+tntnet/tntnet: init.d/tntnet.in
 	sed -e 's,@@libdir\@@,@@libdir@@,g;' \
 	    -e 's,@@pkglibdir\@@,@@pkglibdir@@,g;' \
 	    -e 's,@@sysconfdir\@@,@@sysconfdir@@,g;' \
 	    -e 's,@@localstatedir\@@,@@localstatedir@@,g;' \
-		-e 's,@@datadir\@@,@@datadir@@,g;' <init.d/tntnet.in >init.d/tntnet
+	    -e 's/^function //;' \
+		-e 's,@@datadir\@@,@@datadir@@,g;' <init.d/tntnet.in >tntnet/tntnet
 
-tntnet/tntnet.properties:
+tntnet/tntnet.properties.sample:
 	../tntnet-config --properties tntnet | \
 		sed -e 's,^#file=tntnet.log,file=@@localstatedir@@/log/tntnet/tntnet.log,' >$@@
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@@@ -206,17 +206,18 @@@@ top_builddir = @@top_builddir@@
 top_srcdir = @@top_srcdir@@
 nobase_dist_noinst_DATA = \
     tntnet/tntnet.conf.in \
-    init.d/tntnet.in
+    init.d/tntnet.in \
+    tntnet/mime.conf
 
 nobase_sysconf_DATA = \
-    tntnet/tntnet.conf \
-    init.d/tntnet
+    tntnet/tntnet.conf.sample \
+    tntnet/tntnet
 
 nobase_dist_sysconf_DATA = \
-    tntnet/mime.conf
+    tntnet/mime.conf.sample
 
 nobase_nodist_sysconf_DATA = \
-    tntnet/tntnet.properties
+    tntnet/tntnet.properties.sample
 
 all: all-am
 
@@@@ -483,21 +484,25 @@@@ uninstall-am: uninstall-nobase_dist_sysc
 	uninstall-nobase_sysconfDATA
 
 
-tntnet/tntnet.conf: tntnet/tntnet.conf.in
+tntnet/mime.conf.sample: tntnet/mime.conf
+	cp tntnet/mime.conf $@@
+
+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in
 	sed -e 's,@@libdir\@@,@@libdir@@,g;' \
 	    -e 's,@@pkglibdir\@@,@@pkglibdir@@,g;' \
 	    -e 's,@@sysconfdir\@@,@@sysconfdir@@,g;' \
 	    -e 's,@@localstatedir\@@,@@localstatedir@@,g;' \
-		-e 's,@@datadir\@@,@@datadir@@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf
+		-e 's,@@datadir\@@,@@datadir@@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample
 
-init.d/tntnet: init.d/tntnet.in
+tntnet/tntnet: init.d/tntnet.in
 	sed -e 's,@@libdir\@@,@@libdir@@,g;' \
 	    -e 's,@@pkglibdir\@@,@@pkglibdir@@,g;' \
 	    -e 's,@@sysconfdir\@@,@@sysconfdir@@,g;' \
 	    -e 's,@@localstatedir\@@,@@localstatedir@@,g;' \
-		-e 's,@@datadir\@@,@@datadir@@,g;' <init.d/tntnet.in >init.d/tntnet
+	    -e 's/^function //;' \
+		-e 's,@@datadir\@@,@@datadir@@,g;' <init.d/tntnet.in >tntnet/tntnet
 
-tntnet/tntnet.properties:
+tntnet/tntnet.properties.sample:
 	../tntnet-config --properties tntnet | \
 		sed -e 's,^#file=tntnet.log,file=@@localstatedir@@/log/tntnet/tntnet.log,' >$@@
 
--- a/etc/tntnet/tntnet.conf.in
+++ b/etc/tntnet/tntnet.conf.in
@@@@ -2,12 +2,15 @@@@
 #
 
 PropertyFile	@@sysconfdir@@/tntnet/tntnet.properties
-Listen	    0.0.0.0 80
+#Listen	    0.0.0.0 80
+Listen	    127.1 80
 #SslListen  0.0.0.0 443 @@sysconfdir@@/tntnet/tntnet.pem
 
 Daemon	    1
-User	    www-data
-Group	    www-data
+#User	    www-data
+#Group	    www-data
+User	    www
+Group	    www
 CompPath    @@libdir@@/tntnet
 
 # set some limit to prevent DoS-attacks
@


1.1
log
@Tntnet is a modular, multithreaded, high performance webapplicationserver
for C++. To create webapplications Tntnet has a template-language called
ecpp similar to php, jsp or mason, where you can embed c++-code inside a
html-page to generate active content. The ecpp-files are precompiled to
c++-classes called components and compiled and linked into a shared
library. This process is done at compiletime.

WWW: http://www.tntnet.org/index.html
@
text
@d3 1
a3 1
@@@@ -1,30 +1,35 @@@@
d27 2
a28 2
-tntnet/tntnet.conf: tntnet/tntnet.conf.in Makefile
+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in Makefile
d36 2
a37 2
-init.d/tntnet: init.d/tntnet.in Makefile
+tntnet/tntnet: init.d/tntnet.in Makefile
d46 4
a49 3
-tntnet/tntnet.properties: Makefile
+tntnet/tntnet.properties.sample: Makefile
 	cxxtools-config --logfile @@localstatedir@@/log/tntnet/tntnet.log --properties tntnet >$@@
d52 2
a53 2
@@@@ -194,17 +194,18 @@@@ target_os = @@target_os@@
 target_vendor = @@target_vendor@@
d76 1
a76 1
@@@@ -436,21 +437,25 @@@@ uninstall-am: uninstall-info-am uninstal
d80 1
a80 1
-tntnet/tntnet.conf: tntnet/tntnet.conf.in Makefile
d84 1
a84 1
+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in Makefile
d92 2
a93 2
-init.d/tntnet: init.d/tntnet.in Makefile
+tntnet/tntnet: init.d/tntnet.in Makefile
d102 5
a106 5
-tntnet/tntnet.properties: Makefile
+tntnet/tntnet.properties.sample: Makefile
 	cxxtools-config --logfile @@localstatedir@@/log/tntnet/tntnet.log --properties tntnet >$@@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@

