Changeset 5881 in genesis

Timestamp:

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

Author:

rick

Message:

Genesis config cleanups

Location:

tools

Files:

• FreeBSD5_x/g_list.pl (modified) (5 diffs)
• FreeBSD5_x/genesis.conf (modified) (3 diffs)
• FreeBSD5_x/wleiden.pl (modified) (1 diff)
• FreeBSD6_x/g_list.pl (modified) (2 diffs)
• FreeBSD6_x/genesis.conf (modified) (3 diffs)
• FreeBSD6_x/wleiden.pl (modified) (1 diff)

tools/FreeBSD5_x/g_list.pl

@@ -22 +22 @@
 };
 
-sub filelist {
-  foreach $file ( sort @filelist) {
-    if( $HTML) {
-      print "$file<BR>\n";
-    }
-    else {
-      print "$file\n";
-    };
-  };
-}
-
-sub listnodes {
-  opendir(DIR, $ndir) || die "can't opendir $ndir: $!";
-  @tmpdirs = grep { /^[^\.]/ && -d "$ndir/$_" } readdir(DIR);
-  closedir DIR;
-  foreach $dir (sort @tmpdirs) {
-    if( not exists($removefromnodelist{$dir}) )
-    {
-      push(@nodelist, $dir);
-    }
-    else
-    {
-    if ( $debug ) { print "'$dir' removed from list\n"; }
-    }
-  };
-  return @nodelist;
-}
-
-sub nodelist {
-  foreach $node (listnodes( )) {
-    if( $HTML) {
-      print "$node<BR>\n";
-    }
-    else {
-      print "$node\n";
-    };
-  };
-}
 
 #REQUEST parsen
@@ -66 +28 @@
   ($node,$file)=split(/\//,$1);
   $title="$node $file";
-  if ( $debug ) { print "Node: $node\n"; }
-  if ( $debug ) { print "File: $file\n"; }
 }
 else {
@@ -104 +64 @@
   }
   else {
-   g_list( );
-  }
-}
-elsif( $node eq 'filelist' ) {
-  filelist( );
-}
-elsif( $node eq 'nodelist' ) {
-  nodelist( );
+    g_list( );
+  };
 }
 else {
   if( $file eq '') {
-      filelist( );
+    foreach $file ( sort @filelist) {
+      if( $HTML) {
+        print "$file<BR>\n";
+      }
+      else {
+        print "$file\n";
+      };
+    };
   }
   elsif( $file eq 'config') {
@@ -145 +106 @@
       $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>");
@@ -154 +115 @@
   };
 
-  @dirs = listnodes( );
+  opendir(DIR, $ndir) || die "can't opendir $ndir: $!";
+  @dirs = grep { /^[^\.]/ && -d "$ndir/$_" } readdir(DIR);
+  closedir DIR;
   foreach $dir (sort @dirs) {
     if( $dir=~/attic/ ) {

tools/FreeBSD5_x/genesis.conf

@@ -22 +22 @@
 $filelist[7]="authorized_keys";
 
-#Ignore this node diretories
-%removefromnodelist = (
-                      'retired' => 'YES',
-                      'obsolete' => 'YES',
-                       );
-
-
 #(inter)net env
 if( defined $ENV{'SERVER_NAME'} ) {
@@ -38 +31 @@
 
 chomp($hostname);
-$cgi_dir="http://$hostname/cgi-bin";
+$cgi_dir="http://$hostname/freebsd/5.0";
 $source="$cgi_dir/g_list.pl";
 
 #path variablen
-$home="/home/genesis";
+$home="/usr/local/www/wlconfig.wirelessleiden.nl";
 $ndir="$home/nodes";
-#$toolfile="$home/tools/wleiden.pl";
-#Temp Svn fix
-$toolfile="$home/tools/FreeBSD5_x/wleiden.pl";
+$toolfile="$home/freebsd/5.0/wleiden.pl";
 
 
@@ -57 +48 @@
 
 #module IP.pm
-$IP_pmPath='/home/genesis/tools/IP.pm';
+$IP_pmPath="$home/tools/IP.pm";
 
 #dnsheader.conf
-$dnsheader_confPath='/home/genesis/dns/dnsheader.conf';
+$dnsheader_confPath="$home/dns/dnsheader.conf";
 
 
 ## ssh key variablen ##
 #global ssh_keys
-$global_keyPath='/home/genesis/nodes/global_keys';
+$global_keyPath="$home/nodes/global_keys";
 #node specific
 $ssh_file='ssh_key'

tools/FreeBSD5_x/wleiden.pl

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

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 ##########################