summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Dessaux2017-03-05 18:34:35 +0000
committerJulien Dessaux2017-03-05 18:37:43 +0000
commit2f8d8f69e10858fb3c1ac99ba7eda38ec13e7774 (patch)
treef2ddcdabfbb9c009e8a80e878a7496722d0cabed
parentFixed cf_serverd control file mistake (diff)
downloadmasterfiles-2f8d8f69e10858fb3c1ac99ba7eda38ec13e7774.tar.gz
masterfiles-2f8d8f69e10858fb3c1ac99ba7eda38ec13e7774.tar.bz2
masterfiles-2f8d8f69e10858fb3c1ac99ba7eda38ec13e7774.zip
Added cfengine_stdlib submodule
-rw-r--r--.gitmodules3
-rw-r--r--README16
m---------lib0
-rw-r--r--promises.cf12
4 files changed, 31 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1e41644
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib"]
+ path = lib
+ url = gitolite3@10.1.0.254:cfengine_stdlib
diff --git a/README b/README
new file mode 100644
index 0000000..1e1138e
--- /dev/null
+++ b/README
@@ -0,0 +1,16 @@
+cfengine stdlib
+===============
+
+The cfengine stdlib repo on legend is a repo initialized from the master branch of the official github masterfiles. To update, run:
+
+git clone https://github.com/cfengine/masterfiles/ cfengine_stdlib
+cd cfengine_masterfiles/
+git filter-branch --subdirectory-filter lib -- --all
+git remote remove origin
+git remote add legend gitolite3@10.1.0.254:cfengine_stdlib
+git remote update
+git push legend master
+
+Then in your masterfiles repo:
+
+git submodule update --init --recursive
diff --git a/lib b/lib
new file mode 160000
+Subproject 979626a86c85ed840691f6d2871a4a67184b5dd
diff --git a/promises.cf b/promises.cf
index 24a989c..89d0369 100644
--- a/promises.cf
+++ b/promises.cf
@@ -3,11 +3,13 @@ body common control
any::
bundlesequence => {
cfengine_controls,
+ cfengine_stdlib,
classify,
hello,
};
inputs => {
@(cfengine_controls.inputs),
+ @(cfengine_stdlib.inputs),
"services/main.cf",
};
}
@@ -27,3 +29,13 @@ bundle common cfengine_controls
"DEBUG $(this.bundle)";
"$(const.t)defining inputs='$(inputs)'";
}
+
+bundle common cfengine_stdlib
+{
+ vars:
+ any::
+ "inputs" slist => { "$(sys.local_libdir)/stdlib.cf" };
+ reports:
+ DEBUG|DEBUG_cfengine_stdlib::
+ "$(const.t): defining inputs='$(inputs)'";
+}