Permalink
Browse files

Remove obsolete example_config. Use masterfiles/ and Design Center in…

…stead
  • Loading branch information...
1 parent 8c007b9 commit 9e93241d4c25f615caed1b59dfef15a0c2083f63 @dottedmag dottedmag committed Mar 20, 2012
View
@@ -923,7 +923,6 @@ AC_CONFIG_FILES([Makefile
docs/reference/Makefile
docs/tools/Makefile
examples/Makefile
- examples/example_config/Makefile
masterfiles/Makefile
tests/Makefile
tests/acceptance/Makefile
@@ -1,6 +1,3 @@
-SUBDIRS = example_config
-DIST_SUBDIRS = example_config
-
examplesdir = $(projdocdir)/examples
dist_examples_DATA = $(srcdir)/*.cf
@@ -1,26 +0,0 @@
-exampleconfigdir = $(projdocdir)/example_config
-dist_exampleconfig_DATA = $(srcdir)/failsafe.cf $(top_srcdir)/masterfiles/cfengine_stdlib.cf $(srcdir)/promises.cf $(srcdir)/site.cf $(srcdir)/update.cf
-
-#
-# Some basic clean ups
-#
-MOSTLYCLEANFILES = *~
-
-#
-# Get everything removed down to where rebuilding requires:
-# "make; make install"
-#
-CLEANFILES =
-
-#
-# Get everything removed down to where rebuilding requires:
-# "configure; make; make install"
-#
-DISTCLEANFILES =
-
-#
-# Get everything removed down to where rebuilding requires:
-# "aclocal; autoconf; autoheader; automake --add-missing"
-# "configure; make; make install"
-#
-MAINTAINERCLEANFILES = Makefile.in
@@ -1,33 +0,0 @@
-# Copyright (C) Cfengine AS
-
-# This file is part of Cfengine 3 - written and maintained by Cfengine AS.
-
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 3.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-# To the extent this program is licensed as part of the Enterprise
-# versions of Cfengine, the applicable Commerical Open Source License
-# (COSL) may apply to this file if you as a licensee so wish it. See
-# included file COSL.txt.
-
-#
-# Failsafe file
-#
-
-body common control
-
-{
-bundlesequence => { "update" };
-
-inputs => { "update.cf" };
-}
@@ -1,113 +0,0 @@
-# Copyright (C) Cfengine AS
-
-# This file is part of Cfengine 3 - written and maintained by Cfengine AS.
-
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 3.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-# To the extent this program is licensed as part of the Enterprise
-# versions of Cfengine, the applicable Commerical Open Source License
-# (COSL) may apply to this file if you as a licensee so wish it. See
-# included file COSL.txt.
-
-#######################################################
-#
-# promises.cf
-#
-#######################################################
-
-body common control
-
-{
-bundlesequence => {
- "update",
- "garbage_collection",
- "main",
- "cfengine"
- };
-
-inputs => {
- "update.cf",
- "site.cf",
- "cfengine_stdlib.cf"
- };
-}
-
-#######################################################
-
-body agent control
-{
-# if default runtime is 5 mins we need this for long jobs
-ifelapsed => "15";
-}
-
-#######################################################
-
-body monitor control
-{
-forgetrate => "0.7";
-histograms => "true";
-}
-
-#######################################################
-
-body executor control
-
-{
-splaytime => "1";
-mailto => "cfengine_mail@example.org";
-smtpserver => "localhost";
-mailmaxlines => "30";
-
-# Instead of a separate update script, now do this
-
-exec_command => "$(sys.workdir)/bin/cf-agent -f failsafe.cf && $(sys.workdir)/bin/cf-agent";
-}
-
-#######################################################
-
-body reporter control
-
-{
-reports => { "performance", "last_seen", "monitor_history" };
-build_directory => "$(sys.workdir)/reports";
-report_output => "html";
-}
-
-#######################################################
-
-body runagent control
-{
-hosts => {
- "127.0.0.1"
- # , "myhost.example.com:5308", ...
- };
-
-}
-
-#######################################################
-
-body server control
-
-{
-allowconnects => { "127.0.0.1" , "::1" };
-allowallconnects => { "127.0.0.1" , "::1" };
-trustkeysfrom => { "127.0.0.1" , "::1" };
-
-# Make updates and runs happen in one
-
-cfruncommand => "$(sys.workdir)/bin/cf-agent -f failsafe.cf && $(sys.workdir)/bin/cf-agent";
-allowusers => { "root" };
-}
-
-
Oops, something went wrong.

0 comments on commit 9e93241

Please sign in to comment.