commit: maps command

eotk

@@ -27,7 +27,7 @@ Action() {
     shift
 
     if [ "x$1" = "x" ] ; then
-        Warn "missing project name, try: $prog projects"
+        Warn "missing project name, try: '$prog projects' for a list, or '-a' for all"
         return
     elif [ "x$1" = "x-a" ] ; then
         projects=`AllProjects`

templates.d/maps.txt

@@ -4,6 +4,7 @@ cd %PROJECT_DIR% || exit 1
 
 %%IF %IS_SOFTMAP%
 for hfile in `echo %PROJECT_DIR%/%TOR_WORKER_PREFIX%*.d/hostname` ; do
+    test -f "$onion" || continue
     onion=`cat $hfile`
     %%BEGIN
     echo %PROJECT% softmap %ONION_ADDRESS% %DNS_DOMAIN% via $onion
@@ -14,4 +15,5 @@ done
 echo %PROJECT% hardmap %ONION_ADDRESS% %DNS_DOMAIN%
 %%END
 %%ENDIF
+
 exit 0

tools/do-configure.pl

@@ -235,9 +235,6 @@ sub DoProject {
             );
     }
 
-    # script settings - we'll meed this further down
-    my @scriptrows = (); # empty except for softmap
-
     # nginx config: feed the rows to the template
     my $cmd = "$ENV{TEMPLATE_TOOL} $ENV{NGINX_TEMPLATE} >$ENV{PROJECT_DIR}/nginx.conf";
     &Pipeify($cmd, @{$projects{$project}{ROWS}});
@@ -256,14 +253,6 @@ sub DoProject {
             &SetEnv("tor_dir", $hs_dir, "softmap");
             my $cmd = "$ENV{TEMPLATE_TOOL} $ENV{TOR_TEMPLATE} >$hs_dir/tor.conf";
             &Pipeify($cmd, @{$projects{$project}{ROWS}});
-
-            # poke the script settings
-            my $row = @{$projects{$project}{ROWS}};
-            push(@scriptrows, {
-                'TOR_DIR' => $hs_dir,
-                'DNS_DOMAIN' => (${$row}{DNS_DOMAIN} || "-"),
-                'ONION_ADDRESS' => (${$row}{ONION_ADDRESS} || "-"),
-                 });
         }
     }
     else {
@@ -291,13 +280,6 @@ sub DoProject {
             else {
                 unlink($poison) if (-f $poison);
             }
-
-            push(@scriptrows,
-                 {
-                     'DNS_DOMAIN' => $dns,
-                     'ONION_ADDRESS' => $onion,
-                 }
-                );
         }
 
         # tor config
@@ -309,7 +291,7 @@ sub DoProject {
     foreach my $script (split(" ", $ENV{SCRIPT_NAMES})) {
         my $path = "$ENV{PROJECT_DIR}/$script.sh";
         my $cmd = "$ENV{TEMPLATE_TOOL} templates.d/$script.txt >$path";
-        &Pipeify($cmd, @scriptrows);
+        &Pipeify($cmd, @{$projects{$project}{ROWS}});
         chmod(0700, $path) or die "chmod: $path: $!\n";
     }