fixes for deployment conf

[rrq/hourglass.git] / manager / controls.lsp

diff --git a/manager/controls.lsp b/manager/controls.lsp
index 12d3fbb7154d46d2a1a1f7f895b649f60d6e9118..10153dfdf5eb65f4e25bdcedf3d0990180a94d13 100644 (file)
--- a/manager/controls.lsp
+++ b/manager/controls.lsp
@@ -2,6 +2,10 @@
 
 (load "expand-string.lsp")
 
+(constant
+ 'CONTROLFILE SITE:control.dat
+ )
+
 (setf UPDATE "")
 
 (when (= (env "REQUEST_METHOD") "POST")
@@ -9,19 +13,15 @@
   )
 
 (constant
- '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")
  '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
  DAYS '(0 "Mon" "Tue" "Wed" "Thu" "Fri" "Sat" "Sun")
- incl-options '("ipset-control.lsp")
  gap-options '(0 1 2 5 10 15 30)
  clip-options '(0 200 500 800 1000 1200 1500 2000)
  mode-options '("opened" "timed" "closed")