No longer being maintained, no one expressed interest on mailing list, so removing from trunk.

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

20 files changed, 0 insertions, 417 deletions

diff --git a/encap/src/bcfg2-site/Makefile b/encap/src/bcfg2-site/Makefile
deleted file mode 100644
index 624e77260..000000000
--- a/encap/src/bcfg2-site/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id$
-
-# Variables
-
-PATH = /usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-CHEETAH = /usr/local/lib/bcfg2/bin/cheetah
-
-# Main
-
-.PHONY : all clean distclean fill copy fix encap install test cheetah
-.SUFFIXES : 
-
-BD = /usr/local
-ED = ${BD}/encap
-export ED
-
-all : encap install
-
-clean :
-	for DIR in `find . -type d | grep -v "\.svn"`; do \
-		for GLOB in \#\* \*\~ \*.out\*; do \
-			(rm $${DIR}/$${GLOB} 2>/dev/null || true); \
-		done; \
-	done
-
-distclean : clean
-	-rm *-encap-*.tar.gz
-
-fill : clean
-	$(CHEETAH) fill -R --oext out
-
-copy : fill
-	EN=`cat bcfg2-site-RENAME/encapname.out` && \
-	( test ! -d $(ED)/bcfg2-site-$${EN} || rm -rf $(ED)/bcfg2-site-$${EN} ) && \
-	for SRC in `find bcfg2-site-RENAME | grep -v svn | grep -v tmpl`; do \
-		DEST=$(ED)/`printf "%s\n" "$$SRC" | sed s/RENAME/$$EN/g | sed s/\.out//g`; \
-		if [ -d $$SRC ]; then mkdir $$DEST; else cp $$SRC $$DEST; fi; \
-	done		
-
-fix : copy
-	EN="$(ED)/bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	chown -R 0 $$EN && chgrp -R 0 $$EN && \
-	find $$EN -type d | xargs -n1 chmod 0755 && \
-	find $$EN -type f | xargs -n1 chmod 0644 && \
-	chmod 0600 $$EN/etc/ostiary.cfg && \
-	chmod 0600 $$EN/etc/bcfg2.conf && \
-	chmod 0700 $$EN/sbin/ost-bcfg2* && \
-	chmod 0755 $$EN/postinstall
-
-encap : fix
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	cd $(ED) && \
-	( test ! -f $${EN}-encap-*.tar.gz || rm $${EN}-encap-*.tar.gz ) && \
-	mkencap -c $$EN
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	mv $(ED)/$${EN}-encap-*.tar.gz ./
-    
-install : fix
-	-(EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	epkg -q -r $(ED)/$$EN)
-	EN="bcfg2-site-`cat bcfg2-site-RENAME/encapname.out`" && \
-	cd $(ED) && \
-	epkg -q -i $(ED)/$$EN && \
-	test -h $(BD)/var/encap/$$EN
-
-test :
-	: $(PATH)
-	$(CHEETAH) test
-	
-cheetah :
-	$(CHEETAH) $(ARGS)
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
deleted file mode 100644
index 998a34b4a..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "site-settings.conf"
-encap 2.1       # libencap-2.3.8
-platform share
-date ${DATE}
-contact "${ADMIN_NAME}" <${ADMIN_EMAIL}>
-description bcfg2-site-${SITE_SHORTNAME} - bcfg2 configuration for ${SITE_NAME}
-prereq pkgspec >= bcfg2-0.8.2
-prereq pkgspec >= ostiary-3.4
-prereq pkgspec >= runit-1.7.2
-exclude etc
-exclude sbin
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl
deleted file mode 100644
index 0c0296a16..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapname.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${SITE_SHORTNAME}-${SITE_VERSION}
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
deleted file mode 100644
index 337a7a0bc..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/bcfg2.conf.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-#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}
-
-[statistics]
-sendmailpath = ${SENDMAILPATH}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl
deleted file mode 100644
index 93d733712..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/OPTIONS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_CLIENT_OPTIONS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl
deleted file mode 100644
index e4ff48d09..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-client/env/RUN_INTERVAL_SECONDS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_CLIENT_RUN_INTERVAL_SECONDS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl
deleted file mode 100644
index e4283b54e..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/default/bcfg2-server/env/OPTIONS.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "site-settings.conf"
-${BCFG2_SERVER_OPTIONS}
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
deleted file mode 100644
index 9b7e555c5..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "site-settings.conf"
-# If present, ostiaryd will shut down once the cache of bad IPs is full.
-# Under runit, this just has the effect of generating a service restart
-# log message.
-EXIT_ON_IPCACHE_FULL
-
-# If present, ostiaryd will not detach from the terminal it was started
-# from. This is useful when running ostiaryd from programs like inetd or
-# cygrunsrv or runit.
-SKIP_DETACH
-
-# Port to listen on. (Can be specified on command line.)
-PORT=${OSTIARY_PORT}
-
-# The password to remotely kill ostiaryd. Sort of useless when running under
-# runit, since runit will just start ostiaryd back up. (But it is required
-# to be in this file)
-KILL="${OSTIARY_PASSWORD}-kill"
-
-# Must be at least one action.  Format is:
-# ACTION="secret","command (with path)",["uid"[,"gid"]]
-# NOTE: There is a maximum of 31 actions
-# IMPORTANT: Commands *CAN NOT* have any arguments -
-#            on some platforms arguments are just ignored
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvqn","/usr/local/sbin/ost-bcfg2-dvqn","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvn","/usr/local/sbin/ost-bcfg2-dvn","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dvq","/usr/local/sbin/ost-bcfg2-dvq","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-dv","/usr/local/sbin/ost-bcfg2-dv","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-vq","/usr/local/sbin/ost-bcfg2-vq","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-v","/usr/local/sbin/ost-bcfg2-v","0","0"
-ACTION="${OSTIARY_PASSWORD}-bcfg2-restart","/usr/local/sbin/ost-bcfg2-restart","0","0"
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs b/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
deleted file mode 100755
index 0801ec2c9..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/mkinstalldirs
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do 
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" || errstatus=$?
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
deleted file mode 100755
index 68c5798d8..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
+++ /dev/null
@@ -1,162 +0,0 @@
-#include "site-settings.conf"
-#compiler-settings
-cheetahVarStartToken = @
-commentStartToken = %%
-#end compiler-settings
-#!/bin/sh -e
-
-umask 002
-BASEDIR="${ENCAP_TARGET}" # Usually /usr/local
-PKGDIR="${ENCAP_SOURCE}/${ENCAP_PKGNAME}" # Ususally /usr/local/encap/<pkgname>
-LOG="${PKGDIR}/postinstall.log"
-MKINSTALLDIRS="${PKGDIR}/mkinstalldirs"
-exec > $LOG 2>&1
-
-printf "Running ${ENCAP_PKGNAME} postinstall script...\n"
-date
-
-chmod 755 ${MKINSTALLDIRS}
-${MKINSTALLDIRS} "${BASEDIR}/etc/default/bcfg2-client/env"
-${MKINSTALLDIRS} "${BASEDIR}/etc/default/bcfg2-server/env"
-${MKINSTALLDIRS} "${BASEDIR}/sbin"
-
-rmcp() {
-    SRCFILENAME="`basename ${1}`"
-    if [ -d "${2}" ]; then
-        DESTDIRNAME="$2"
-    else 
-        DESTDIRNAME="`dirname ${2}`"
-    fi
-    TARGETNAME="$DESTDIRNAME/$SRCFILENAME"
-    RMTARGET="no"
-    if [ -h "$TARGETNAME" ]; then RMTARGET="yes"; fi
-    if [ -f "$TARGETNAME" ]; then RMTARGET="yes"; fi
-    if [ "${RMTARGET}x"="yesx" ]; then
-        DATE="`date +%Y-%m-%d--%H-%M-%S`"
-        printf "INFO: Moving old $TARGETNAME to ${TARGETNAME}-${DATE}...\n"
-        cp "$TARGETNAME" "${TARGETNAME}-${DATE}" && rm "$TARGETNAME"
-    fi
-    printf "INFO: Copying %s to %s...\n" "$1" "$2"
-    cp "$1" "$2"
-}
-
-# bcfg2-client (options)
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing bcfg2-client sentinel files...\n"
-    S_B="${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2 client options have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/default/bcfg2-client/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2 client options have been previously updated -\n"
-    printf "INFO: not replacing that configuration.\n"
-else
-    DIR="etc/default/bcfg2-client"
-    rmcp $PKGDIR/$DIR/env/RUN_INTERVAL_SECONDS ${BASEDIR}/$DIR/env/
-    rmcp $PKGDIR/$DIR/env/OPTIONS ${BASEDIR}/$DIR/env/
-    touch ${BASEDIR}/$DIR/.SENTINEL_SITE
-fi
-
-# bcfg2-server (options)
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing bcfg2-server sentinel files...\n"
-    S_B="${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2 server options have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/default/bcfg2-server/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2 server options have been previously updated -\n"
-    printf "INFO: not replacing that configuration.\n"
-else
-    DIR="etc/default/bcfg2-server"
-    rmcp $PKGDIR/$DIR/env/OPTIONS ${BASEDIR}/$DIR/env/
-    touch ${BASEDIR}/$DIR/.SENTINEL_SITE
-fi
-
-# bcfg2.conf & ostiary.conf
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing ${BASEDIR}/etc sentinel files...\n"
-    S_B="${BASEDIR}/etc/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/etc/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/etc/.SENTINEL_BCFG2 ]; then
-    printf "INFO: bcfg2.conf and/or ostiary.cfg may have been updated by\n"
-    printf "INFO: bcfg2 - not replacing that configuration.\n"
-elif [ -f ${BASEDIR}/etc/.SENTINEL_SITE ]; then
-    printf "INFO: bcfg2.conf and/or ostiary.cfg may have been previously\n"
-    printf "INFO: updated - not replacing that configuration.\n"
-else
-    rmcp $PKGDIR/etc/bcfg2.conf ${BASEDIR}/etc/
-    rmcp $PKGDIR/etc/ostiary.cfg ${BASEDIR}/etc/
-    touch ${BASEDIR}/etc/.SENTINEL_SITE
-fi
-
-# sbin/ost-bcfg2*
-if [ "${REPLACE_CONFIG}x" = "yesx" ]; then
-    printf "REPLACE_CONFIG=yes, so removing ${BASEDIR}/sbin sentinel files...\n"
-    S_B="${BASEDIR}/sbin/.SENTINEL_BCFG2"
-    test -f ${S_B} && rm ${S_B}
-    S_S="${BASEDIR}/sbin/.SENTINEL_SITE"
-    test -f ${S_S} && rm ${S_S}
-fi
-
-if [ -f ${BASEDIR}/sbin/.SENTINEL_BCFG2 ]; then
-    printf "INFO: sbin/ost-bcfg2* may have been updated by bcfg2 -\n"
-    printf "INFO: not replacing that configuration with this script.\n"
-elif [ -f ${BASEDIR}/sbin/.SENTINEL_SITE ]; then
-    printf "INFO: sbin/ost-bcfg2* may have been previously updated -\n"
-    printf "INFO: not replacing that configuration with this script.\n"
-else
-    OSTSH="ost-bcfg2-dv ost-bcfg2-dvn ost-bcfg2-dvq ost-bcfg2-dvqn ost-bcfg2-restart ost-bcfg2.sh ost-bcfg2-v ost-bcfg2-vq"
-    for OSTFILE in $OSTSH; do
-        rmcp $PKGDIR/sbin/${OSTFILE} ${BASEDIR}/sbin/
-    done
-    chmod 700 ${BASEDIR}/sbin/*
-    touch ${BASEDIR}/sbin/.SENTINEL_SITE
-fi
-
-# ostiary (runit)
-if [ ! -h /usr/local/var/service/ostiary ]; then
-    if [ -d /usr/local/etc/sv/ostiary ]; then
-        printf "INFO: Enabling ostiary service (via runit)...\n"
-        ln -s /usr/local/etc/sv/ostiary /usr/local/var/service/ostiary
-    else
-        printf "ERROR: /usr/local/etc/sv/ostiary does not exist.\n"
-        exit 1
-    fi
-else
-    printf "INFO: /usr/local/var/service/ostiary already exists, not replacing...\n"
-fi
-
-# bcfg2-client (runit)
-%%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"
-        ln -s /usr/local/etc/sv/bcfg2-client /usr/local/var/service/bcfg2-client
-    else
-        printf "ERROR: /usr/local/etc/sv/bcfg2-client does not exist.\n"
-        printf "ERROR: Could not enable bcfg2-client service.\n"
-    fi
-else
-    printf "INFO: /usr/local/var/service/bcfg2-client already exists, not replacing...\n"
-fi
-%%end if
-
-# end
-printf "Finished ${ENCAP_PKGNAME} postinstall script.\n"
-
-exit 0
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dv
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvn
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvq
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-dvqn
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-restart
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-v
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq
deleted file mode 120000
index 2296c9078..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2-vq
+++ /dev/null
@@ -1 +0,0 @@
-ost-bcfg2.sh
\ No newline at end of file
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
deleted file mode 100755
index ea819b01a..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-#
-# ost-bcfg2.sh : Control bcfg2 client via ostiary (wrapper script)
-# $Id$
-#
-
-umask 002
-exec 2>&1
-
-PATH=/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-PYTHONPATH="/usr/local/lib/bcfg2/lib/python2.4:/usr/local/lib/bcfg2/lib/python2.4/site-packages:/usr/local/lib/bcfg2/lib/python2.4/site-packages/Bcfg2"
-export PATH PYTHONPATH
-
-LOGDIR="/usr/local/var/svlogd/bcfg2-client-ostiary"
-test -d $LOGDIR || mkdir $LOGDIR
-LOG="svlogd -tt $LOGDIR"
-
-case $0 in
-       *-dvqn) bcfg2 -d -v -q -n       | $LOG ;;
-        *-dvn) bcfg2 -d -v -n          | $LOG ;;
-        *-dvq) bcfg2 -d -v -q          | $LOG ;;
-         *-dv) bcfg2 -d -v             | $LOG ;;
-         *-vq) bcfg2 -v -q             | $LOG ;;
-          *-v) bcfg2 -v                | $LOG ;; 
-    *-restart) sv restart bcfg2-client | $LOG ;; 
-            *) printf "ERROR in $0\n"  | $LOG ;; 
-esac
-
-exit 0
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME b/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME
deleted file mode 100644
index e69de29bb..000000000
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/var/encap/bcfg2-site-RENAME
+++ /dev/null
diff --git a/encap/src/bcfg2-site/site-settings.conf-example b/encap/src/bcfg2-site/site-settings.conf-example
deleted file mode 100644
index e7f99cffb..000000000
--- a/encap/src/bcfg2-site/site-settings.conf-example
+++ /dev/null
@@ -1,49 +0,0 @@
-######
-###### Set these variables as appropriate for your site
-######
-####
-#### Site Information
-####
-#set global $ADMIN_NAME = "Local Admin Contact"
-#set global $ADMIN_EMAIL = "tickets@localhost.localdomain.com"
-#set global $SITE_NAME = "localdomain.com"
-## SITE_SHORTNAME should be a single word with no punctuation
-#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
-####
-#set global $SENDMAILPATH = "/usr/sbin/sendmail"
-#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, 
-## so you probably want to include the "-n" (dry-run mode) flag, unless you
-## already have a good configuration in place. You can then change the config
-## file /usr/local/etc/default/bcfg2-client/env/OPTIONS via the bcfg2 "Cfg"
-## functionality (possibly by kicking off a non-dry from the bcfg2 server using
-## ostiary, or just by running bcfg2 manually on the client) to run in non-dry-
-## run mode.
-#set global $BCFG2_CLIENT_OPTIONS = "-q -v -d -n"
-## Initial options for bcfg2-server(8). Note that bcfg2-server is not fully
-## configured by bcfg2-site; you need to edit /usr/local/etc/bcfg2.conf to 
-## include the "[server]" stanza and appropriate values, as well as a "key ="
-## line in the "[communications]" stanza (see bcfg2 doc for details).
-#set global $BCFG2_SERVER_OPTIONS = "-v"
-## You can set passwords here, and you will not be prompted for them at
-## install time; however you will then have to treat your bcfg2-site
-## distribution as equivalent to the bcfg2 server and ostiary passwords.
-## To be prompted for passwords at install time, make these empty string ("")
-#set global $BCFG2_PASSWORD = ""
-#set global $OSTIARY_PASSWORD = ""
-######
-###### Automatically-set variables - you shouldn't have to touch these.
-######
-#from time import localtime, strftime
-#set global $DATE = strftime("%a %b %d %H:%M:%S %Z %Y", localtime())