diff options
author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-25 06:12:43 +0000 |
---|---|---|
committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-25 06:12:43 +0000 |
commit | 2e0d46f2539189e8773f4827c20548bd275e2529 (patch) | |
tree | cead071c477cc79b47361c099abb57d276db97e7 | |
parent | 7d04c19afa0f690a3123fc5a7c929a4675b37b84 (diff) | |
download | bcfg2-2e0d46f2539189e8773f4827c20548bd275e2529.tar.gz bcfg2-2e0d46f2539189e8773f4827c20548bd275e2529.tar.bz2 bcfg2-2e0d46f2539189e8773f4827c20548bd275e2529.zip |
EncapPackages: Add bcfg2-client "daemon" start to bcfg2-site
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2108 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r-- | encap/TODO | 16 | ||||
-rwxr-xr-x | encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl (renamed from encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall) | 18 | ||||
-rw-r--r-- | encap/src/bcfg2-site/site-settings.conf-example | 1 | ||||
-rw-r--r-- | encap/src/encap-profiles/bcfg2-0.8.3pre3.ep | 6 | ||||
-rw-r--r-- | encap/src/encap-profiles/makeself-2.1.4.ep | 1 |
5 files changed, 31 insertions, 11 deletions
diff --git a/encap/TODO b/encap/TODO index 5c4978aca..2205b2a92 100644 --- a/encap/TODO +++ b/encap/TODO @@ -1,25 +1,21 @@ - * Add daemontools bcfg2-client service startup to either bcfg2-site, or - makeself install script. - * makeself-dist: create/test - * Handle TODO items in ./src/encap-profiles/makeself-2.1.4.ep * End result will be .run distribution that installs all client stuff * gamin and glib (server requirements) will be manual install items * Double-check all permissions, and make sure they are not effected by the environment's umask - * Big documentation update - - * Build everywhere, basic test and post binaries - - * Announce to mailing list: + * Small documentation update + + * Send blurb to desai for 0.8.3 announcement: * daemontools & ostiary stuff * encap support for Solaris (sparc and x86) * Binary epkg archive at http://www.pobox.com/users/dclark/mirror/bcfg2-encaps - * Fix epkg README/Makefile links on dclark.us + * Build everywhere, basic test + + * Big documentation update * Handle removals nicely (preremove/postremove scripts) * Work towards full compliance with encap 2.1 spec diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl index 4ed875e4c..a02c265cb 100755 --- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall +++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl @@ -1,3 +1,8 @@ +#include "site-settings.conf" +#compiler-settings +cheetahVarStartToken = @ +commentStartToken = // +#end compiler-settings #!/bin/sh -e umask 002 @@ -76,6 +81,19 @@ else touch ${BASEDIR}/sbin/.SENTINEL_SITE fi +//if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0 +if [ ! -h /service/bcfg2-client ]; then + if [ -d /usr/local/var/svc.d/bcfg2-client ]; then + ln -s /usr/local/var/svc.d/bcfg2-client /service/bcfg2-client + else + printf "ERROR: /usr/local/var/svc.d/bcfg2-client does not exist.\n" + exit 1 + fi +else + printf "INFO: /service/bcfg2-client already exists, not replacing...\n" +fi +//end if + printf "Finished ${ENCAP_PKGNAME} postinstall script.\n" exit 0 diff --git a/encap/src/bcfg2-site/site-settings.conf-example b/encap/src/bcfg2-site/site-settings.conf-example index c29ab36e2..dd7b0425e 100644 --- a/encap/src/bcfg2-site/site-settings.conf-example +++ b/encap/src/bcfg2-site/site-settings.conf-example @@ -18,6 +18,7 @@ #set global $BCFG2_SERVER = "config.localdomain.com" #set global $BCFG2_PORT = "6" #set global $OSTIARY_PORT = "7" +## How often to run the bcfg2 client, or "0" to disable #set global $BCFG2_CLIENT_RUN_INTERVAL_SECONDS = "3600" ## Initial options for bcfg(1). The bcfg2 client is started with these options ## on installation and periodically based on BCFG2_CLIENT_RUN_INTERVAL_SECONDS, diff --git a/encap/src/encap-profiles/bcfg2-0.8.3pre3.ep b/encap/src/encap-profiles/bcfg2-0.8.3pre3.ep index 90fe1183d..0772a7218 100644 --- a/encap/src/encap-profiles/bcfg2-0.8.3pre3.ep +++ b/encap/src/encap-profiles/bcfg2-0.8.3pre3.ep @@ -2,6 +2,12 @@ <!-- $Id$ --> +<!-- To make this work with a new version of bcfg2, first do a "svn mv" --> +<!-- of this file to the new version name, and then do a global search- --> +<!-- replace of the version with the new version (i.e. search for --> +<!-- "0.8.3pre3" and replace with "0.8.3") - DO NOT DO IT MANUALLY, --> +<!-- the version string is referenced by some of the included files. --> + <encap_profile profile_ver="1.0" pkgspec="bcfg2-0.8.3pre3" diff --git a/encap/src/encap-profiles/makeself-2.1.4.ep b/encap/src/encap-profiles/makeself-2.1.4.ep index fa64e1da8..824d2cc40 100644 --- a/encap/src/encap-profiles/makeself-2.1.4.ep +++ b/encap/src/encap-profiles/makeself-2.1.4.ep @@ -14,7 +14,6 @@ url="http://www.pobox.com/users/dclark/mirror/makeself/makeself-2.1.4.run http://www.megastep.org/makeself/makeself-2.1.4.run" subdir="/" > -<!-- TODO check above megastep URL, and create mirror --> <unpack><![CDATA[ cd .. && \ |