--- trunk/tntnet/config/tntnet.conf	2007/11/27 11:38:32	66
+++ trunk/tntnet/config/tntnet.conf	2007/11/27 14:23:18	67
@@ -1,6 +1,11 @@
 # tntnet.conf
 #
 
+
+#Settings for "FlisFyr" project
+dburl "postgresql:host=localhost:db=flisfyr:user=torben:passwd=nielsen"
+#end of flisfyr settings
+
 PropertyFile	/etc/tntnet/tntnet.properties
 Listen	    0.0.0.0 80
 #SslListen  0.0.0.0 443 /etc/tntnet/tntnet.pem
@@ -14,6 +19,7 @@
 # set some limit to prevent DoS-attacks
 MaxRequestSize     1048576  # 1 MB
 
+
 #Dir                /
 #Chroot             /var/safedir
 PidFile            /var/run/tntnet.pid
@@ -45,17 +51,6 @@
 
 MapUrl  ^/$                          redirect@tntnet /dynamic/
 
-MapUrl  ^/demos/controls$            redirect@tntnet /demos/controls/
-MapUrl  ^/demos/controls/(.*)\..*    $1@controls
-MapUrl  ^/demos/controls/$           index@controls  index
-MapUrl  ^/demos/controls/(.*)        index@controls  $1
-MapUrl  ^/demos/(.*)\..*             $1@$1    $1
-MapUrl  ^/demos/(.*)                 $1@$1
-MapUrl  ^/demos/tntnet.jpg           tntnet@hello
-MapUrl  ^/demos/$                    static@tntnet /usr/share/tntnet/demos.html
-MapUrl  ^/demos/(.*)\.png$           static@tntnet /usr/share/tntnet/$1.png
-MapUrl  ^/demos/(.*)\.js$            static@tntnet /usr/share/tntnet/$1.js
-
 # configure tntnet as a simple webserver
 MapUrl  .*      mime@tntnet
 MapUrl  ^/(.*/)?$ static@tntnet /home/torben/tntnet/static/$1index.html