Changeset 5881 in genesis for tools/FreeBSD6_x

Timestamp:

Jan 28, 2008, 8:52:13 PM (17 years ago)

Author:

rick

Message:

Genesis config cleanups

Location:

tools/FreeBSD6_x

Files:

• g_list.pl (modified) (2 diffs)
• genesis.conf (modified) (3 diffs)
• wleiden.pl (modified) (1 diff)

tools/FreeBSD6_x/g_list.pl

@@ -6 +6 @@
 
 # Config located at other file
-my $local_conf_file="./genesis.conf.local";
-do($local_conf_file) || die("Cann't open $local_conf_file");
-
+my $conf_file="./genesis.conf";
 do($conf_file) || die("Cann't open $conf_file");
+
 
 
@@ -146 +145 @@
       $revision=$1;
     };
-    printline("<H1>Genesis config (revision: $revision):</H1><P>\n<PRE>");
+    printline("<H1>Genesis config - last changed rev $revision</H1><P>\n<PRE>");
     printline("$svn_version");
     printline("</PRE>");

tools/FreeBSD6_x/genesis.conf

@@ -1 @@
-#!/usr/bin/perl -
+#!/usr/bin/perl -w
 #
 # Variable file
@@ -26 +26 @@
                        );
 
+#(inter)net env
+if( defined $ENV{'SERVER_NAME'} ) {
+  $hostname=$ENV{'SERVER_NAME'};
+}
+else {
+  $hostname=`hostname`;
+};
 
+chomp($hostname);
+$cgi_dir="http://$hostname/freebsd/6.0";
+$source="$cgi_dir/g_list.pl";
+
+#path variablen
+$home="/usr/local/www/wlconfig.wirelessleiden.nl";
+$ndir="$home/nodes";
+$toolfile="$home/freebsd/6.0/wleiden.pl";
+
+
+#exec vars
+$svn="/usr/local/bin/svn";
+$wicontrol='/usr/sbin/wicontrol';
 
 #naming vars
@@ -37 +57 @@
 $dnsheader_confPath="$home/dns/dnsheader.conf";
 
-#node dir
-$ndir="$home/nodes";
-
-#wleiden.pl Path
-$toolfile="$home/tools/FreeBSD6_x/wleiden.pl";
 
 ## ssh key variablen ##

tools/FreeBSD6_x/wleiden.pl

@@ -6 +6 @@
 
 # Config located at other file
-# Config located at other file
-my $local_conf_file="./genesis.conf.local";
-do($local_conf_file) || die("Cann't open $local_conf_file");
-
+my $conf_file="./genesis.conf";
 do($conf_file) || die("Cann't open $conf_file");
 ################ END OF CONFIG ##########################