X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=manager%2Fcontrols.lsp;h=60c00b5148ee19976c3d0d6286de0997b0b79496;hb=30dfa8ed48bceb1df62c4accf5b7a680d1b20634;hp=b4779aee24a9e5684483b8c387e04702c1c4803c;hpb=8e3c55b65d2acf7ed3ab2f9eeaffcc5b9d6d117f;p=rrq%2Fhourglass.git diff --git a/manager/controls.lsp b/manager/controls.lsp index b4779ae..60c00b5 100644 --- a/manager/controls.lsp +++ b/manager/controls.lsp @@ -1,4 +1,4 @@ -; Load and present ../controls.dat +; Load and present control.dat (load "expand-string.lsp") @@ -9,13 +9,14 @@ ) (constant - 'CONTROLFILE "../control.dat" + 'CONTROLFILE "control.dat" 'CONTROL (read-expr (read-file CONTROLFILE)) 'GAP (or (lookup 'gap CONTROL) 5) 'CLIP (or (lookup 'clip CONTROL) 5) - 'INCL (or (lookup control CONTROL) "ipset-control.lsp") + 'INCL (or (lookup 'control CONTROL) "ipset-control.lsp") 'TIMES (map (fn (n) (or (assoc n CONTROL) '(1 timed (7 0) (3 0) (19 0)))) (sequence 1 7)) + 'NET (or (lookup 'net CONTROL) "10.0.0.0/8") ) (setf