From bf75be54d4be5a1ab45fe52613a432c9ff365e01 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 28 Nov 2005 20:57:13 +0000
Subject: Move generic stuff from cf.groups.merge to cf.main, and prepare for
 renaming to cf.generic.

---
 cfengine/cf.generic      | 12 +++++++++---
 cfengine/cf.groups.merge |  5 -----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'cfengine')

diff --git a/cfengine/cf.generic b/cfengine/cf.generic
index bd1b6a8..608d150 100644
--- a/cfengine/cf.generic
+++ b/cfengine/cf.generic
@@ -1,6 +1,6 @@
 ##############################################################
 #
-# cf.main
+# cf.generic
 #
 # This file contains generic config stuff
 #
@@ -8,10 +8,16 @@
 
 ###
 #
-# BEGIN cf.main
+# BEGIN cf.generic
 #
 ###
 
+groups:
+	All		= ( Hr00 )
+	peaktime	= ( Hr10 Hr11 Hr12 Hr13 Hr14 Hr15 )
+	OnTheHour	= ( Min00_05 Min5_10 Min10_15 Min15_20 Min20_25 )
+	HalfHour	= ( Min30_35 Min35_40 Min40_45 Min45_50 Min50_55 )
+
 control:
 
 	Access    	= ( root )        # Only root should run this
@@ -129,6 +135,6 @@ disable:
 
 ###
 #
-# END cf.main
+# END cf.generic
 #
 ###
diff --git a/cfengine/cf.groups.merge b/cfengine/cf.groups.merge
index d4f331e..0984f86 100644
--- a/cfengine/cf.groups.merge
+++ b/cfengine/cf.groups.merge
@@ -33,8 +33,3 @@ groups:
 	wp		= ( wp_jones		wp_xenux )
 	dnai		= ( dnai_jones		dnai_xenux )
 	sunrise		= ( sunrise_jones	sunrise_xenux )
-
-	All		= ( Hr00 )
-	peaktime	= ( Hr10 Hr11 Hr12 Hr13 Hr14 Hr15 )
-	OnTheHour	= ( Min00_05 Min5_10 Min10_15 Min15_20 Min20_25 )
-	HalfHour	= ( Min30_35 Min35_40 Min40_45 Min45_50 Min50_55 )
-- 
cgit v1.2.3