From e9b840ee20c12f9b5698eb1403ce38eb18ead62f Mon Sep 17 00:00:00 2001
From: "Paul Buetow (pluto.buetow.org)" <paul@buetow.org>
Date: Sat, 7 Sep 2013 17:44:24 +0200
Subject: rename config.txt into xerl.conf

---
 Makefile   |  4 ++--
 config.txt | 25 -------------------------
 index.fpl  |  4 +++-
 index.pl   |  4 ++--
 xerl.conf  | 25 +++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 config.txt
 create mode 100644 xerl.conf

diff --git a/Makefile b/Makefile
index 6bfaecf..2151b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ clean:
 stats:	clean
 	perl scripts/stats.pl
 replace:
-	for i in index.pl Xerl.pm config.txt; \
+	for i in index.pl Xerl.pm xerl.conf; \
 	do \
 		sed -n "s/$(FROM)/$(INTO)/g; \
 		w .tmp" $$i && mv -f .tmp $$i; \
@@ -23,7 +23,7 @@ pidy:
 	find . -name \*.pm | xargs perltidy -b 
 	find . -name \*.bak | xargs rm -f
 todo:
-	grep -R TODO . | grep -v Makefile | grep -v .svn
+	grep -R TODO . | grep -v Makefile | grep -v .git
 warn: 
 	perl index.pl 2> warnings
 	less warnings
diff --git a/config.txt b/config.txt
deleted file mode 100644
index c87afb6..0000000
--- a/config.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# TODO: Allow comments behind the options! 
-# defaultproto will be used if not ENV(HTTPS)==on
-#nocache=defined
-#nocache=1
-cacheroot=/usr/local/www/xerlcache/
-cookievals=nocache,plain,devel,style,template
-ctype.asc=text/plain
-ctype.css=text/css
-ctype.jpg=image/jpg 
-ctype.pdf=application/pdf 
-ctype.png=image/png 
-ctype.txt=text/plain
-ctype.xml=text/plain
-defaultcontent=home
-defaulthost=default
-defaultoutputformat=xhtml
-defaultproto=http
-defaultstyle=default.css
-defaulttemplate=xhtml
-dslvpnrouter.buetow.org=vpndslrouter.buetow.org
-hidesubhome=1
-hostroot=/usr/local/www/xerlhosts/branches/stable/hosts/
-statsroot=/usr/local/www/xerlstats/
-hyperion.buetow.org=ssl.buetow.org
-404=http://www.buetow.org
diff --git a/index.fpl b/index.fpl
index a7d41b4..3ac017c 100755
--- a/index.fpl
+++ b/index.fpl
@@ -10,7 +10,9 @@ use Socket;
 use Sys::Hostname;
 
 my $host = hostname();
-my $config = -e "config-$host.txt" ?  "config-$host.txt" : 'config.txt';
+my $config = -e "xerldev-$host.conf" ? "xerldev-$host.conf" : (
+  -e "xerl-$host.conf" ? "xerl-$host.conf" : 'config.conf'
+);
 
 while (FCGI::accept >= 0) {
 	my Xerl $xerl = Xerl->new( config => $config );
diff --git a/index.pl b/index.pl
index 4442648..f1f5531 100755
--- a/index.pl
+++ b/index.pl
@@ -9,8 +9,8 @@ use Socket;
 use Sys::Hostname;
 
 my $host = hostname();
-my $config = -e "configdev-$host.txt" ? "configdev-$host.txt" : (
-  -e "config-$host.txt" ? "config-$host.txt" : 'config.txt'
+my $config = -e "xerldev-$host.conf" ? "xerldev-$host.conf" : (
+  -e "xerl-$host.conf" ? "xerl-$host.conf" : 'config.conf'
 );
 
 my Xerl $xerl = Xerl->new( config => $config );
diff --git a/xerl.conf b/xerl.conf
new file mode 100644
index 0000000..c87afb6
--- /dev/null
+++ b/xerl.conf
@@ -0,0 +1,25 @@
+# TODO: Allow comments behind the options! 
+# defaultproto will be used if not ENV(HTTPS)==on
+#nocache=defined
+#nocache=1
+cacheroot=/usr/local/www/xerlcache/
+cookievals=nocache,plain,devel,style,template
+ctype.asc=text/plain
+ctype.css=text/css
+ctype.jpg=image/jpg 
+ctype.pdf=application/pdf 
+ctype.png=image/png 
+ctype.txt=text/plain
+ctype.xml=text/plain
+defaultcontent=home
+defaulthost=default
+defaultoutputformat=xhtml
+defaultproto=http
+defaultstyle=default.css
+defaulttemplate=xhtml
+dslvpnrouter.buetow.org=vpndslrouter.buetow.org
+hidesubhome=1
+hostroot=/usr/local/www/xerlhosts/branches/stable/hosts/
+statsroot=/usr/local/www/xerlstats/
+hyperion.buetow.org=ssl.buetow.org
+404=http://www.buetow.org
-- 
cgit v1.2.3