Changeset 7380 in genesis for tools/proxy-8.0

Timestamp:

Jan 20, 2010, 7:31:19 PM (15 years ago)

Author:

richardvm

Message:

Added GATEWAY var

Location:

tools/proxy-8.0

Files:

• genesis.conf (modified) (4 diffs)
• wleiden.pl (modified) (2 diffs)

tools/proxy-8.0/genesis.conf

@@ -10 +10 @@
 
 #author credits
-$author="feb 2003 jasper\@WirelessLeiden.NL \| maart 2005/jul 2009 rick\@WirelessLeiden.NL";
+$author="feb 2003 jasper\@WirelessLeiden.NL \| maart 2005/jul 2009 rick\@WirelessLeiden.NL \| jan 2010/jan 2010 richardvm\@WirelessLeiden.nl";
 
 #filelist
 @filelist = ();
-$filelist[0]="dhcpd.conf";
+#$filelist[0]="dhcpd.conf";
 $filelist[1]="rc.node.local";
 $filelist[2]="resolv.conf";
@@ -20 +20 @@
 $filelist[4]="txtconfig";
 $filelist[5]="authorized_keys";
-$filelist[6]="dnsmasq.conf";
+#$filelist[6]="dnsmasq.conf";
 
 #Ignore this node diretories
@@ -37 +37 @@
 
 chomp($hostname);
-$cgi_dir="http://$hostname/freebsd/iris";
+$cgi_dir="http://$hostname/freebsd/proxy-8.0";
 $source="$cgi_dir/g_list.pl";
 
@@ -43 +43 @@
 $home=getcwd . "/../../";
 $ndir="$home/nodes";
-$toolfile="$home/freebsd/iris/wleiden.pl";
+$toolfile="$home/freebsd/proxy-8.0/wleiden.pl";
 
 

tools/proxy-8.0/wleiden.pl

@@ -218 +218 @@
   my $masterNotUsed = master_ipNotUsed();
   $output.=
-  "hostname=\"$nodetype$nodename.$domain\"\n" .
+  "hostname=\"$nodename.$domain\"\n" .
   "location=\"$location\"\n" .
   "\n";
-
+  if( $gateway ) {
+    $output .=  
+    "defaultrouter='$gateway'\n"
+  }
   if( $tproxy ) {
     if( $tproxy =~ m/\d+\.\d+\.\d+\.\d+\/\d+/ ) {
@@ -281 +284 @@
   my $output = genHeader"#";
 
-  $output .= 
-  "search wleiden.net.\n" .
-  "# Try local (cache) first \n" .
-  "nameserver 127.0.0.1\n" .
-  "# Direct neighboors\n" .
-  "\n";
-
-  foreach my $if (sort keys %config) {
-    if( exists $POINT_TO_POINT{$if} ) {
-      foreach my $ip ($POINT_TO_POINT{$if}) {
-        $output .= "nameserver $ip # $DESC{$if}\n";
-      };
-    };
-  };
+#  $output .= 
+#  "search wleiden.net.\n" .
+#  "# Try local (cache) first \n" .
+#  "nameserver 127.0.0.1\n" .
+#  "# Direct neighboors\n" .
+#  "\n";
+#
+#  foreach my $if (sort keys %config) {
+#    if( exists $POINT_TO_POINT{$if} ) {
+#      foreach my $ip ($POINT_TO_POINT{$if}) {
+#        $output .= "nameserver $ip # $DESC{$if}\n";
+#      };
+#    };
+#  };
+#
+#  $output .=
+#  "\n" .
+#  "# Last resort/backup remote nameservers \n" .
+#  "nameserver 172.17.8.68    # proxy1\n" .
+#  "nameserver 172.17.143.4   # proxy2\n" .
+#  "nameserver 172.20.128.98  # proxy3\n" .
+#  "nameserver 172.16.2.254   # proxy4\n" .
+#  "nameserver 172.19.168.66  # proxy5\n";
 
   $output .=
-  "\n" .
-  "# Last resort/backup remote nameservers \n" .
-  "nameserver 172.17.8.68    # proxy1\n" .
-  "nameserver 172.17.143.4   # proxy2\n" .
-  "nameserver 172.20.128.98  # proxy3\n" .
-  "nameserver 172.16.2.254   # proxy4\n" .
-  "nameserver 172.19.168.66  # proxy5\n";
+  "nameserver 195.169.86.131\n" .
+  "search wirelessleiden.nl";
 
   return($output);