* reorged tangential tools into tools directory

 * added ostiary encap


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2024 ce84e21b-d406-0410-9b95-82705330c041

8 files changed, 141 insertions, 5 deletions

diff --git a/encap/TODO b/encap/TODO
index ccb1927ca..669bd044d 100644
--- a/encap/TODO
+++ b/encap/TODO
@@ -1,9 +1,17 @@
-  * Test daemontools encap, including postinstall scripts for config
-  * Use daemontools to run the bcfg2 service under the encap packaging scheme
-    * Create bcfg2 "run" script (look at init scripts for other platforms)
-  * Modify Makefile, README, bcfg2-0.8.2.ep to work with daemontools
+  * daemontools:
+    * Test daemontools encap, including postinstall scripts for config
+    * Use daemontools to run the bcfg2 service on bootup (once) under the 
+      encap packaging scheme
+      * Create bcfg2 "run" script (look at init scripts for other platforms)
+    * Modify Makefile, README, bcfg2-0.8.2.ep to work with daemontools
+
+  * ostiary:
+    * Test encap
+    * Create daemontools "run" script
+    * Integration with bcfg2 client
+
   * Announce to mailing list:
-    * daemontools stuff
+    * daemontools & ostiary stuff
     * encap support for Solaris (sparc and x86)
     * Binary epkg archive at 
       http://www.pobox.com/users/dclark/mirror/bcfg2-encaps
diff --git a/encap/tools/README b/encap/tools/README
new file mode 100644
index 000000000..3a7ae54a3
--- /dev/null
+++ b/encap/tools/README
@@ -0,0 +1,17 @@
+daemontools - http://cr.yp.to/daemontools.html
+----------------------------------------------
+D. J. Bernstein's daemontools - a collection of tools for managing
+UNIX services the same way across all UNIX platforms. May be useful to
+set up one-time run of bcfg2 client at startup, or to run ostiary.
+
+epkg - http://www.encap.org/epkg
+--------------------------------
+Mark D. Roth's epkg - an encap pacakage manager. Needed to build the
+*.ep and *.sh files, although in most cases epkg binaries for your
+platform will already exist.
+
+ostiary - http://ingles.homeunix.org/software/ost
+-------------------------------------------------
+Ray Ingles' ostiary - simple, secure remote script execution.  May be
+useful if you like/are used to being able to kick off a config update
+on a config client from a config server, like with cfengine.
\ No newline at end of file
diff --git a/encap/daemontools-0.76.ep b/encap/tools/daemontools/daemontools-0.76.ep
index 58ec6988f..58ec6988f 100644
--- a/encap/daemontools-0.76.ep
+++ b/encap/tools/daemontools/daemontools-0.76.ep
diff --git a/encap/daemontools-doc-20060731.ep b/encap/tools/daemontools/daemontools-doc-20060731.ep
index dee918647..dee918647 100644
--- a/encap/daemontools-doc-20060731.ep
+++ b/encap/tools/daemontools/daemontools-doc-20060731.ep
diff --git a/encap/epkg/Makefile b/encap/tools/epkg/Makefile
index 6f4cf7277..6f4cf7277 100644
--- a/encap/epkg/Makefile
+++ b/encap/tools/epkg/Makefile
diff --git a/encap/epkg/README b/encap/tools/epkg/README
index 99355280b..99355280b 100644
--- a/encap/epkg/README
+++ b/encap/tools/epkg/README
diff --git a/encap/tools/ostiary/ostiary-3.4.ep b/encap/tools/ostiary/ostiary-3.4.ep
new file mode 100644
index 000000000..7630f95fb
--- /dev/null
+++ b/encap/tools/ostiary/ostiary-3.4.ep
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="ostiary-3.4"
+>
+
+<environment
+        variable="CC"
+        value="gcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<source
+url="http://www.pobox.com/users/dclark/mirror/ostiary/ostiary-3.4.tar.gz
+     http://ingles.homeunix.org/software/ost/ostiary-3.4.tar.gz"
+	use_objdir="no"
+>
+
+</source>
+
+<prepackage>
+mkdir var 2>/dev/null || exit 0
+mkdir var/encap 2>/dev/null || exit 0
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description Ostiary - Simple, Secure Remote Script Execution
+</encapinfo>
+
+</encap_profile>
diff --git a/encap/tools/ostiary/ostiary-doc-20060801.ep b/encap/tools/ostiary/ostiary-doc-20060801.ep
new file mode 100644
index 000000000..3b0251f2e
--- /dev/null
+++ b/encap/tools/ostiary/ostiary-doc-20060801.ep
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!-- $Id$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="ostiary-doc-20060801"
+>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+<source
+url="http://www.pobox.com/users/dclark/mirror/ostiary/ostiary-doc-20060801.tar.gz"
+	use_objdir="no"
+>
+
+<configure>
+:
+</configure>
+
+<build>
+:
+</build>
+
+<install>
+test -d ${ENCAP_SOURCE} || mkdir ${ENCAP_SOURCE}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME} || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc
+test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary
+cp * ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/share/doc/ostiary
+</install>
+
+<clean>
+:
+</clean>
+
+</source>
+
+<prepackage>
+mkdir var 2>/dev/null || exit 0
+mkdir var/encap 2>/dev/null || exit 0
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description ostiary-doc - documentation from ostiary website
+</encapinfo>
+
+</encap_profile>