add more test for table=

if it starts _after_ the outputs are populated, it should
write the first lot of outputs without waiting for a change

modules/ppp/common.nix

@@ -0,0 +1,83 @@
+{ writeAshScript, liminix, svc, lib, serviceFns, output-template }:
+{
+  command,
+  name,
+  debug
+, username,
+  password,
+  lcpEcho,
+  ppp-options,
+  dependencies ? []
+} :
+let
+  inherit (lib) optional optionals escapeShellArgs concatStringsSep;
+  inherit (liminix.services) longrun;
+  inherit (builtins) toJSON toString typeOf;
+
+  ip-up = writeAshScript "ip-up" {} ''
+    . ${serviceFns} 
+    (in_outputs ${name}
+     echo $1 > ifname
+     echo $2 > tty
+     echo $3 > speed
+     echo $4 > address
+     echo $5 > peer-address
+     echo $DNS1 > ns1
+     echo $DNS2 > ns2
+    )
+    echo >/proc/self/fd/10
+  '';
+  ip6-up = writeAshScript "ip6-up" {} ''
+    . ${serviceFns} 
+    (in_outputs ${name}
+     echo $4 > ipv6-address
+     echo $5 > ipv6-peer-address
+    )
+    echo >/proc/self/fd/10
+  '';
+  literal_or_output =
+    let v = o: ({
+          string = toJSON;
+          int = toJSON;
+          lambda = (o: "output(${toJSON (o "service")}, ${toJSON (o "path")})");
+        }.${typeOf o}) o;
+    in  o: "{{ ${v o} }}";
+
+  ppp-options' =
+    ["+ipv6" "noauth"]
+    ++ optional debug "debug"
+    ++ optionals (username != null) ["name" (literal_or_output username)]
+    ++ optionals (password != null) ["password" (literal_or_output password)]
+    ++ optional lcpEcho.adaptive "lcp-echo-adaptive"
+    ++ optionals (lcpEcho.interval != null)
+      ["lcp-echo-interval" (toString lcpEcho.interval)]
+    ++ optionals (lcpEcho.failure != null)
+      ["lcp-echo-failure" (toString lcpEcho.failure)]
+    ++ ppp-options
+    ++ ["ip-up-script" ip-up
+        "ipv6-up-script" ip6-up
+        "ipparam" name
+        "nodetach"
+        "usepeerdns"
+        "nodefaultroute"
+        "logfd" "2"
+       ];
+  service = longrun {
+    inherit name;
+    run = ''
+      mkdir -p /run/${name}
+      chmod 0700 /run/${name}
+      in_outputs ${name}
+      echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/ppp-options
+      ${command}
+    '';
+    notification-fd = 10;
+    timeout-up = if lcpEcho.failure != null
+                 then (10 + lcpEcho.failure * lcpEcho.interval) * 1000
+                 else 60 * 1000;
+    inherit dependencies;
+  };
+in svc.secrets.subscriber.build {
+  watch = [ username password ];
+  inherit service;
+}

modules/ppp/l2tp.nix

@@ -1,12 +1,13 @@
 {
-  liminix
+  lib,
-, lib
+  liminix,
-, svc
+  output-template,
-, output-template
+  serviceFns,
-, writeAshScript
+  svc,
-, writeText
+  writeAshScript,
-, serviceFns
+  writeText,
-, xl2tpd
+  xl2tpd,
+  callPackage
 } :
 { lns,
   ppp-options,
@@ -16,57 +17,8 @@
   debug
 }:
 let
-  inherit (liminix.services) longrun;
-  inherit (lib) optional optionals escapeShellArgs concatStringsSep;
   name = "${lns}.l2tp";
-  ip-up = writeAshScript "ip-up" {} ''
+  common = callPackage ./common.nix { inherit svc; };
-    . ${serviceFns} 
-    (in_outputs ${name}
-     echo $1 > ifname
-     echo $2 > tty
-     echo $3 > speed
-     echo $4 > address
-     echo $5 > peer-address
-     echo $DNS1 > ns1
-     echo $DNS2 > ns2
-    )
-    echo >/proc/self/fd/10
-  '';
-  ip6-up = writeAshScript "ip6-up" {} ''
-    . ${serviceFns} 
-    (in_outputs ${name}
-     echo $4 > ipv6-address
-     echo $5 > ipv6-peer-address
-    )
-    echo >/proc/self/fd/10
-  '';
-
-  literal_or_output =
-    let v = o: ({
-          string = builtins.toJSON;
-          int = builtins.toJSON;
-          lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
-        }.${builtins.typeOf o}) o;
-    in  o: "{{ ${v o} }}";
-
-  ppp-options' =
-    ["+ipv6" "noauth"]
-    ++ optional debug "debug"
-    ++ optionals (username != null) ["name" (literal_or_output username)]
-    ++ optionals (password != null) ["password" (literal_or_output password)]
-    ++ optional lcpEcho.adaptive "lcp-echo-adaptive"
-    ++ optionals (lcpEcho.interval != null)
-      ["lcp-echo-interval" (builtins.toString lcpEcho.interval)]
-    ++ optionals (lcpEcho.failure != null)
-      ["lcp-echo-failure" (builtins.toString lcpEcho.failure)]
-    ++ ppp-options
-    ++ ["ip-up-script" ip-up
-        "ipv6-up-script" ip6-up
-        "ipparam" name
-        "nodetach"
-        "usepeerdns"
-        "logfd" "2"
-       ];
 
   conf = writeText "xl2tpd.conf" ''
     [lac upstream]
@@ -79,19 +31,10 @@ let
     max redials = 2 # this gives 1 actual retry, as xl2tpd can't count
   '';
   control = "/run/${name}/control";
-  service = longrun {
+in common {
-    inherit name;
+  inherit name debug username password lcpEcho ppp-options;
-    run = ''
+  command = ''
-      mkdir -p /run/${name}
-      chmod 0700 /run/${name}
     touch ${control}
-      in_outputs ${name}
-      echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/ppp-options
     exec ${xl2tpd}/bin/xl2tpd -D -p /run/${name}/${name}.pid -c ${conf} -C ${control} 
   '';
-    notification-fd = 10;
-  };
-in svc.secrets.subscriber.build {
-  watch = [ username password ];
-  inherit service;
 }

modules/ppp/pppoe.nix

@@ -1,12 +1,13 @@
 {
-  liminix
+  lib,
-, svc
+  liminix,
-, lib
+  output-template,
-, output-template
+  ppp,
-, ppp
+  pppoe,
-, pppoe
+  serviceFns,
-, writeAshScript
+  svc,
-, serviceFns
+  writeAshScript,
+  callPackage
 } :
 { interface,
   ppp-options,
@@ -16,74 +17,14 @@
   debug
 }:
 let
-  inherit (liminix.services) longrun;
-  inherit (lib) optional optionals escapeShellArgs concatStringsSep;
   name = "${interface.name}.pppoe";
-  ip-up = writeAshScript "ip-up" {} ''
+  common = callPackage ./common.nix { inherit svc; };
-    . ${serviceFns} 
-    (in_outputs ${name}
-     echo $1 > ifname
-     echo $2 > tty
-     echo $3 > speed
-     echo $4 > address
-     echo $5 > peer-address
-     echo $DNS1 > ns1
-     echo $DNS2 > ns2
-    )
-    echo >/proc/self/fd/10
-  '';
-  ip6-up = writeAshScript "ip6-up" {} ''
-    . ${serviceFns} 
-    (in_outputs ${name}
-     echo $4 > ipv6-address
-     echo $5 > ipv6-peer-address
-    )
-    echo >/proc/self/fd/10
-  '';
 
-  literal_or_output =
-    let v = o: ({
-          string = builtins.toJSON;
-          int = builtins.toJSON;
-          lambda = (o: "output(${builtins.toJSON (o "service")}, ${builtins.toJSON (o "path")})");
-        }.${builtins.typeOf o}) o;
-    in  o: "{{ ${v o} }}";
-  ppp-options' =
-    ["+ipv6" "noauth"]
-    ++ optional debug "debug"
-    ++ optionals (username != null) ["name" (literal_or_output username)]
-    ++ optionals (password != null) ["password" (literal_or_output password)]
-    ++ optional lcpEcho.adaptive "lcp-echo-adaptive"
-    ++ optionals (lcpEcho.interval != null)
-      ["lcp-echo-interval" (builtins.toString lcpEcho.interval)]
-    ++ optionals (lcpEcho.failure != null)
-      ["lcp-echo-failure" (builtins.toString lcpEcho.failure)]
-    ++ ppp-options
-    ++ ["ip-up-script" ip-up
-        "ipv6-up-script" ip6-up
-        "ipparam" name
-        "nodetach"
-        "usepeerdns"
-        "logfd" "2"
-       ];
   timeoutOpt = if lcpEcho.interval != null then "-T ${builtins.toString (4 * lcpEcho.interval)}" else "";
-  service = longrun {
+in common {
-    inherit name;
+  inherit name debug username password lcpEcho ppp-options;
-    run = ''
+  command = ''
-      mkdir -p /run/${name}
-      chmod 0700 /run/${name}
-      in_outputs ${name}
-      echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/ppp-options
     exec ${ppp}/bin/pppd pty "${pppoe}/bin/pppoe ${timeoutOpt}  -I $(output ${interface} ifname)" file /run/${name}/ppp-options
   '';
-    notification-fd = 10;
-    timeout-up = if lcpEcho.failure != null
-                 then (10 + lcpEcho.failure * lcpEcho.interval) * 1000
-                 else 60 * 1000;
   dependencies = [ interface ];
-  };
-in svc.secrets.subscriber.build {
-  watch = [ username password ];
-  inherit service;
-  action = "restart-all";
 }

pkgs/anoia/init.fnl

@@ -66,7 +66,10 @@
  (assert (table= {:a 1 :b {:l 17}} {:b {:l 17} :a 1}))
  (assert (table= {:a [4 5 6 7] } {:a [4 5 6 7]}))
  (assert (not (table= {:a [4 5 6 7] } {:a [4 5 6 7 8]})))
- (assert (not (table= {:a [4 5 7 6] } {:a [4 5 6 7 ]}))))
+ (assert (not (table= {:a [4 5 7 6] } {:a [4 5 6 7 ]})))
+
+ (assert (table= {} {}))
+ )
 
 (fn dig [tree path]
   (match path

pkgs/tangc/tangc.fnl

@@ -107,14 +107,14 @@
                     "application/x-www-form-urlencoded"
                     body)
     s (json.decode s)
-   (nil err) (error err)))
+    (nil code msg) (error (.. "Error " code " POST " url ": " msg))))
 
 
 (fn http-get [url body]
   (match
       (http.fetch url)
     s (json.decode s)
-   (nil code msg) (error (.. "Error: " code ": " msg))))
+    (nil code msg) (error (.. "Error " code " GET " url ": " msg))))
 
 (fn decrypt []
   (let [b64 (base64 :url)

pkgs/watch-ssh-keys/watch-ssh-keys.fnl

@@ -11,6 +11,7 @@
 
 (fn write-changes [path old-tree new-tree]
   (when (not (table= old-tree new-tree))
+    (io.stderr:write "new ssh keys\n")
     (each [username pubkeys (pairs new-tree)]
       (with-open [f (assert (io.open (.. path "/" username) :w))]
         ;;  the keys are "1" "2" "3" etc, so pairs not ipairs
@@ -47,14 +48,13 @@
     (os.remove out-dir)
     ))
 
-
 (fn run []
   (let [{: out-path : watched-service : path } (parse-args arg)
         dir (.. watched-service "/.outputs")
         service (assert (svc.open dir))]
-    (accumulate [tree (service:output path)
+    (accumulate [tree {}
                  v (service:events)]
-      (write-changes out-path tree (service:output path)))))
+      (write-changes out-path tree (or (service:output path) {})))))
 
 
 { : run }

pkgs/write-fennel/default.nix

@@ -31,7 +31,6 @@ stdenv.mkDerivation {
      echo "#!${lua}/bin/lua ${luaFlags}"
      echo "package.path = ${lib.strings.escapeShellArg (concatStringsSep "" luapath)} .. package.path"
      echo "package.cpath = ${lib.strings.escapeShellArg (concatStringsSep "" luacpath)} .. package.cpath"
-     echo "local ok, stdlib = pcall(require,'posix.stdlib'); if ok then stdlib.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
      echo "local ok, ll = pcall(require,'lualinux'); if ok then ll.setenv('PATH',${lib.escapeShellArg (lib.makeBinPath packages)} .. \":\" .. os.getenv('PATH')) end"
      fennel ${if macropath != "" then "--add-macro-path ${lib.strings.escapeShellArg macropath}" else ""}  ${if correlate then "--correlate" else ""} --compile ${source} 
     ) >  ${name}.lua