From 7a89730b31f67677d70424f154575ce3c63ba6c0 Mon Sep 17 00:00:00 2001 From: Daniel Joseph Barnhart Clark Date: Mon, 25 Jun 2007 13:12:31 +0000 Subject: EncapPackages: Use %% instead of // for cheetah commands; // was messing up http:// git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3359 ce84e21b-d406-0410-9b95-82705330c041 --- encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl | 6 +++--- encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 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 3086aabd1..337a7a0bc 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,13 +1,13 @@ #include "site-settings.conf" #compiler-settings -commentStartToken = // +commentStartToken = %% #end compiler-settings [communication] protocol = xmlrpc/ssl password = ${BCFG2_PASSWORD} -//if str($SITE_FINGERPRINT) != "" +%%if str($SITE_FINGERPRINT) != "" fingerprint = ${SITE_FINGERPRINT} -//end if +%%end if [components] bcfg2 = https://${BCFG2_SERVER}:${BCFG2_PORT} diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl index c8ed2d694..b00ff7dfb 100755 --- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl +++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl @@ -1,7 +1,7 @@ #include "site-settings.conf" #compiler-settings cheetahVarStartToken = @ -commentStartToken = // +commentStartToken = %% #end compiler-settings #!/bin/sh -e @@ -138,7 +138,7 @@ else fi # bcfg2-client (runit) -//if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0 +%%if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0 if [ ! -h /usr/local/var/service/bcfg2-client ]; then if [ -d /usr/local/etc/sv/bcfg2-client ]; then printf "INFO: Enabling bcfg2-client service (via runit)...\n" @@ -150,7 +150,7 @@ if [ ! -h /usr/local/var/service/bcfg2-client ]; then else printf "INFO: /usr/local/var/service/bcfg2-client already exists, not replacing...\n" fi -//end if +%%end if # end printf "Finished ${ENCAP_PKGNAME} postinstall script.\n" -- cgit v1.2.3-1-g7c22