summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2005-12-08 09:42:49 +0000
committerJonas Smedegaard <dr@jones.dk>2005-12-08 09:42:49 +0000
commit635bdfc48b2dc9b80577fd08409e7852e78cb81f (patch)
tree318341556bd10cc313aac2d9168fb7216241ed2e
parente933a37abb29f8ee754de6d31de4ca7af60d575b (diff)
Include ORG-specific settings from below /etc/local-ORG/cfengine.
-rwxr-xr-xcfengine/cfengine.conf27
1 files 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
-#
-###