rename config.txt into xerl.conf

4 files changed, 7 insertions, 5 deletions

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/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/config.txt b/xerl.conf
index c87afb6..c87afb6 100644
--- a/config.txt
+++ b/xerl.conf