From 635bdfc48b2dc9b80577fd08409e7852e78cb81f Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 8 Dec 2005 09:42:49 +0000
Subject: Include ORG-specific settings from below /etc/local-ORG/cfengine.

---
 cfengine/cfengine.conf | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/cfengine/cfengine.conf b/cfengine/cfengine.conf
index 1cead82..bf6af30 100755
--- a/cfengine/cfengine.conf
+++ b/cfengine/cfengine.conf
@@ -1,21 +1,8 @@
 #!/usr/bin/cfengine -f
 
-#####################################################################
-# 
-#  CFENGINE CONFIGURATION FOR site = jones.dk|xenux.dk
-#
-#  This file is for root only.
-#
-######################################################################
-
-###
-#
-# BEGIN cfengine.conf (Only hard classes in this file )
-#
-###
-
 control:
 	cfroot		= ( /etc/local-COMMON/cfengine )
+	cforgroot	= ( /etc/local-ORG/cfengine )
 
 import:
 
@@ -23,17 +10,9 @@ import:
    # Split things up to keep things tidy
    #
 
-	$(cfroot)/cf.groups.jones
-	$(cfroot)/cf.groups.xenux
-	$(cfroot)/cf.groups.merge
+	$(cforgroot)/cf.groups
 	$(cfroot)/cf.generic
 	$(cfroot)/cf.isp
-	$(cfroot)/cf.site
+	$(cforgroot)/cf.site
 	$(cfroot)/cf.services
 #	$(cfroot)/cf.motd
-
-###
-#
-# END cfengine.conf
-#
-###
-- 
cgit v1.2.3