diff options
| author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-04-27 13:50:22 +0000 |
|---|---|---|
| committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-04-27 13:50:22 +0000 |
| commit | 9e6e24fe943afbb271c5c289b1738de41c4a1273 (patch) | |
| tree | 0077200237ba7080d9858b3302a5186be964eb49 | |
| parent | b782601cffd93ac76c777abff1453140ffe16d74 (diff) | |
| download | bcfg2-9e6e24fe943afbb271c5c289b1738de41c4a1273.tar.gz bcfg2-9e6e24fe943afbb271c5c289b1738de41c4a1273.tar.bz2 bcfg2-9e6e24fe943afbb271c5c289b1738de41c4a1273.zip | |
EncapPackages: Fixed bcfg2 deps, added fingerprint to bcfg2-site. Ready to go for 0.9.3.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3067 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl | 6 | ||||
| -rw-r--r-- | encap/src/bcfg2-site/site-settings.conf-example | 2 | ||||
| -rw-r--r-- | encap/src/encap-profiles/bcfg2-0.9.3.ep | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl index 536faa82d..3086aabd1 100644 --- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl +++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl @@ -1,7 +1,13 @@ #include "site-settings.conf" +#compiler-settings +commentStartToken = // +#end compiler-settings [communication] protocol = xmlrpc/ssl password = ${BCFG2_PASSWORD} +//if str($SITE_FINGERPRINT) != "" +fingerprint = ${SITE_FINGERPRINT} +//end if [components] bcfg2 = https://${BCFG2_SERVER}:${BCFG2_PORT} diff --git a/encap/src/bcfg2-site/site-settings.conf-example b/encap/src/bcfg2-site/site-settings.conf-example index dd7b0425e..e7f99cffb 100644 --- a/encap/src/bcfg2-site/site-settings.conf-example +++ b/encap/src/bcfg2-site/site-settings.conf-example @@ -11,6 +11,8 @@ #set global $SITE_SHORTNAME = "localdomain" ## SITE_VERSION should be the version of this file, starting at 1 #set global $SITE_VERSION = "1" +## SITE_FINGERPRINT value, or "" to disable +#set global $SITE_FINGERPRINT = "" #### #### Paths, Variables, and Passwords #### diff --git a/encap/src/encap-profiles/bcfg2-0.9.3.ep b/encap/src/encap-profiles/bcfg2-0.9.3.ep index 8576455b5..2f4866f7a 100644 --- a/encap/src/encap-profiles/bcfg2-0.9.3.ep +++ b/encap/src/encap-profiles/bcfg2-0.9.3.ep @@ -18,6 +18,7 @@ <prereq package="bcfg2-pkg-config-0.21" /> <prereq package="bcfg2-python-2.4.4" /> <prereq package="bcfg2-elementtree-1.2.6" /> +<prereq package="bcfg2-m2crypto-0.17" /> <environment variable="CC" |