aboutsummaryrefslogtreecommitdiff
path: root/rcynic/scripts/freebsd
diff options
context:
space:
mode:
Diffstat (limited to 'rcynic/scripts/freebsd')
-rw-r--r--rcynic/scripts/freebsd/install.sh2
-rw-r--r--rcynic/scripts/freebsd/rcynic.conf27
2 files changed, 1 insertions, 28 deletions
diff --git a/rcynic/scripts/freebsd/install.sh b/rcynic/scripts/freebsd/install.sh
index 56c4c7a8..2b3d1f4b 100644
--- a/rcynic/scripts/freebsd/install.sh
+++ b/rcynic/scripts/freebsd/install.sh
@@ -53,7 +53,7 @@ fi
if /bin/test -r "$jaildir/etc/rcynic.conf"; then
echo "You already have config file \"${jaildir}/etc/rcynic.conf\", so I will use it."
-elif /usr/bin/install -m 444 -o root -g wheel -p rcynic.conf "${jaildir}/etc/rcynic.conf"; then
+elif /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf"; then
echo "Installed minimal ${jaildir}/etc/rcynic.conf, adding SAMPLE trust anchors"
for i in ../../sample-trust-anchors/*.cer; do
j="$jaildir/etc/trust-anchors/${i##*/}"
diff --git a/rcynic/scripts/freebsd/rcynic.conf b/rcynic/scripts/freebsd/rcynic.conf
deleted file mode 100644
index 6e464e7e..00000000
--- a/rcynic/scripts/freebsd/rcynic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#
-# Sample rcynic configuration file for FreeBSD jailed environment
-
-[rcynic]
-rsync-program = /bin/rsync
-authenticated = /data/authenticated
-old-authenticated = /data/authenticated.old
-unauthenticated = /data/unauthenticated
-lockfile = /data/lock
-jitter = 600
-use-syslog = true
-log-level = log_usage_err
-
-# You need to specify some trust anchors here, eg:
-
-#trust-anchor.1 = /etc/trust-anchors/ta-1.cer
-#trust-anchor.2 = /etc/trust-anchors/ta-2.cer
-
-# or, using the "Trust Anchor Locator" form:
-
-#trust-anchor-locator.1 = /etc/trust-anchors/ta-1.tal
-#trust-anchor-locator.2 = /etc/trust-anchors/ta-2.tal
-
-# The choice between these two formats depends largely on the policies
-# of the entity generating the corresponding trust anchor, ie, will
-# probably be made for you by the generating entity.