--- projects/cms/source/server/build/etc/system.conf	2001/05/24 14:11:32	1.54
+++ projects/cms/source/server/build/etc/system.conf	2002/03/20 16:32:37	1.64
@@ -6,7 +6,7 @@
 # root of configuration
 #
 # $Author: tdb $
-# $Id: system.conf,v 1.54 2001/05/24 14:11:32 tdb Exp $
+# $Id: system.conf,v 1.64 2002/03/20 16:32:37 tdb Exp $
 #
 ############################################################
 #### Configuration Files & Groups
@@ -58,8 +58,11 @@ Queue.RemoveAlgorithm=FIRST
 # The default port to listen for new host connections
 FilterManager.listenPort=4567
 
+# Access control list
+FilterManager.ACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
 
 
+
 ############################################################
 #### Filter configuration
 ############################################################
@@ -69,8 +72,8 @@ Filter.UDPListenPort=4589
 Filter.TCPListenPort=4589
 
 # Plugin Information
-Filter.PluginsPackage=uk.org.iscream.filter.plugins
-Filter.Plugins=TypeChecker;EnforceEssentialData
+Filter.PluginsPackage=uk.org.iscream.cms.server.filter.plugins
+Filter.Plugins=TypeChecker;EnforceEssentialData;SourceChecker
 
 # The name for the root filter
 RootFilter.name=root
@@ -78,8 +81,22 @@ RootFilter.name=root
 # The default parent filter (should almost always be the same as Filter.rootFilter)
 Filter.parentFilter=root
 
+# The input methods to activate
+# (comment or set to 0 to disable)
+Filter.ActivateTCPReader=1
+Filter.ActivateUDPReader=1
+Filter.ActivateCORBAReader=1
 
+# Access control list for the TCP and UDP inputs
+Filter.TCPACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
+Filter.UDPACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
 
+# Access control list for the SourceChecker plugin
+#   - packets not permitted by this ACL will be filtered
+Filter.SourceCheckerPluginACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
+
+
+
 ############################################################
 #### Root filter interfaces configuration
 ############################################################
@@ -100,8 +117,12 @@ ClientInterface.listenPort=4510
 # The name for the client interface
 ClientInterface.name=realtimeclients
 
+# Access Control List for TCP Clients
+ClientInterface.TCPControlChannelACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
+ClientInterface.TCPDataChannelACL=DEFAULT:DENY;*.ukc.ac.uk:ALLOW;129.12.*:ALLOW
 
 
+
 ############################################################
 #### Database interface configuration
 ############################################################
@@ -121,10 +142,9 @@ Host.filter=computingFilter;
 # The default update times for a new host
 Host.UDPUpdateTime=10
 Host.TCPUpdateTime=60
-Host.AveragerUpdateTime=5
 
 # The services checks to run on a host
-Host.serviceChecksPackage=uk.org.iscream.filter.plugins
+Host.serviceChecksPackage=uk.org.iscream.cms.server.filter.plugins
 
 
 
@@ -133,7 +153,7 @@ Host.serviceChecksPackage=uk.org.iscream.filter.plugin
 ############################################################
 
 ## The monitors to run
-Monitor.PluginsPackage=uk.org.iscream.client.monitors
+Monitor.PluginsPackage=uk.org.iscream.cms.server.client.monitors
 Monitor.Plugins=CPU;Load;Process;Disk;Memory;Swap;Services;\
                 Heartbeat;Queue;UserCount;WebFeeder;
 
@@ -191,7 +211,7 @@ Monitor.Disk.threshold.UPPER=95
 Monitor.Disk.thresholdMeasure=PERCENTAGE
 
 
-# Disk monitor threshold values
+# Queue monitor threshold values
 Monitor.Queue.threshold.LOWER=50
 Monitor.Queue.threshold.UPPER=80
 # Thresholds given are PERCENTAGE or VALUE
@@ -222,6 +242,10 @@ Monitor.Heartbeat.checkPeriod=50
 # how many times we should be at the highest level before
 # we go to a FINAL alert
 Monitor.Heartbeat.reachFINALcount=5
+# list of hosts we expect to have at startup
+# this ensures we notice hosts that aren't running, not
+# just those that have gone down recently.
+Monitor.Heartbeat.initialHosts=raptor.ukc.ac.uk;myrtle.ukc.ac.uk;kestrel.ukc.ac.uk
 
 
 
@@ -242,7 +266,7 @@ Monitor.Heartbeat.reachFINALcount=5
 #
 
 # alerters to run
-Alerter.PluginsPackage=uk.org.iscream.client.alerters
+Alerter.PluginsPackage=uk.org.iscream.cms.server.client.alerters
 Alerter.Plugins=EMail;IRC;WebFeeder;Logging;
 
 
@@ -261,7 +285,8 @@ Alerter.IRC.IRCServer = killigrew.ukc.ac.uk
 Alerter.IRC.IRCPort = 6667
 Alerter.IRC.nickList = iscreamBot;_iscreamBot;i-screamBot
 Alerter.IRC.user = i-scream
-Alerter.IRC.comment = i-scream alerting bot
+Alerter.IRC.comment = i-scream alerting bot (based on PircBot)
+Alerter.IRC.finger = i-scream alerting bot (based on PircBot)
 Alerter.IRC.channel = #i-scream
 Alerter.IRC.message = %level%: %attributeName% on %source% has passed %threshold%(%thresholdValue%) threshold with %value% - time till next alert (should one occur), %timeTillNextAlert%
 Alerter.IRC.reconnectDelay = 30
@@ -281,7 +306,7 @@ Alerter.IRC.rejectMessage = sorry, I don't understand 
 
 # Logging alerter configuration
 Alerter.Logging.level = WARNING
-Alerter.EMail.message = %level%: %attributeName% on %source% has passed %threshold%(%thresholdValue%) threshold with %value%
+Alerter.Logging.message = %level%: %attributeName% on %source% has passed %threshold%(%thresholdValue%) threshold with %value%