moved GAP and CLIP to be site conf

diff --git a/control-logic.lsp b/control-logic.lsp
index d75a9133a629e0fe46a2d24b9f0c8fe8baa52311..bdf291d858cae4fe80cad182a4e709473d6db2d2 100644 (file)
--- a/control-logic.lsp
+++ b/control-logic.lsp
@@ -27,6 +27,8 @@
  DAY (list YEAR MONTH DATE)
  HM (list HOUR MINUTE)
  TOTAL '()
+ GAP SITE:control.activity.gap
+ CLIP SITE:control.activity.clip
  )
 
 # Load CONTROL.DAT
@@ -40,11 +42,6 @@
          (list DOW (6 30) 120 (20 0)))
      )
 
-(setf
- GAP (or (lookup 'gap CONTROL) 15)
- CLIP (or (lookup 'clip CONTROL) 1000)
- )
-
 # Load the configured control mechanism
 (if (lookup 'control CONTROL) (load $it)
   (die "** Unknown control mechanism. Exiting!!"))

diff --git a/hourglass.conf b/hourglass.conf
index c424ffbeac1536fe8794a43ffe2a189d790841ec..7a9bfe2ab5fa4403b030fe5a20db31ef9fc2e3e7 100644 (file)
--- a/hourglass.conf
+++ b/hourglass.conf
@@ -8,6 +8,8 @@ listener.tap = hourglass
 listener.tundev = /dev/net/tun
 
 control.action = ipset-control.lsp
+control.activity.gap = 10
+control.activity.clip = 1000
 control.dat = control.dat
 control.net = 10.0.0.0/8
 control.extra.dat = control-extra.dat

diff --git a/manager/tmpl/controls-form.html b/manager/tmpl/controls-form.html
index 84b26114435c502db045c4283c520e1007588d94..e048b00d54940d823c4abc0abd60b3bec837d001 100644 (file)
--- a/manager/tmpl/controls-form.html
+++ b/manager/tmpl/controls-form.html
@@ -55,22 +55,6 @@
          </tr>
        </MAP>
       </table>
-      <div id="extras">
-       <div id="gap_toggle" class="extra">
-         <select name="gap">
-           <MAP> (X) (map list gap-options) <option value="X"
-<?newlisp (if (= (mapv X) GAP) "selected" "")?>>X</option></MAP>
-         </select>
-         idle minutes between activity sessions.
-       </div>
-       <div id="clip-toggle">
-         <select name="clip" class="extra">
-           <MAP> (X) (map list clip-options) <option value="X"
-<?newlisp (if (= (mapv X) CLIP) "selected" "")?>>X</option></MAP>
-         </select>
-         networks packets in a minute, to count as activity.
-       </div>
-      </div>
       <div id="form_submit" class="extra" >
        <?newlisp UPDATE?>
        <input type="submit" value="update">