diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-07 16:49:37 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-07 16:49:37 +0000 |
| commit | 3a6e89edc0a52c58e2c08d3de4e360de777f14a7 (patch) | |
| tree | fcc9ae9597924b12b6ff7b5b7dbfb2b65f20fb29 | |
| parent | 5b630a16212c3e68171b53443e197f04dba8694a (diff) | |
Move rcynic.conf to separate file
svn path=/rcynic/scripts/freebsd/setup-jail.sh; revision=372
| -rw-r--r-- | rcynic/scripts/freebsd/setup-jail.sh | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/rcynic/scripts/freebsd/setup-jail.sh b/rcynic/scripts/freebsd/setup-jail.sh index 5c71073a..4ee1cad5 100644 --- a/rcynic/scripts/freebsd/setup-jail.sh +++ b/rcynic/scripts/freebsd/setup-jail.sh @@ -64,34 +64,18 @@ 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." -else - echo "Creating minmal ${jaildir}/etc/rcynic.conf" - /bin/cat >"${jaildir}/etc/rcynic.conf" <<-EOF - [rcynic] - rsync-program = /bin/rsync - authenticated = /data/authenticated - old-authenticated = /data/authenticated.old - unauthenticated = /data/unauthenticated - lockfile = /data/lock - jitter = 600 - EOF +elif /usr/bin/install -m 444 -u root -g wheel -p rcynic.conf "${jaildir}/etc/rcynic.conf" + echo "Installed minimal ${jaildir}/etc/rcynic.conf" j=1 for i in $jaildir/etc/trust-anchors/*.cer; do echo >>"${jaildir}/etc/rcynic.conf" "trust-anchor.$j = /etc/trust-anchors/${i##*/}" j=$((j+1)) done - if /bin/test "$j" = "1"; then - /bin/cat >>"${jaildir}/etc/rcynic.conf" <<-EOF - # 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 - EOF +else + echo "Installing minimal ${jaildir}/etc/rcynic.conf failed" + exit 1 fi -/usr/sbin/chown root:wheel "${jaildir}/etc/rcynic.conf" -/bin/chmod 444 "${jaildir}/etc/rcynic.conf" - echo "Setting up root's crontab to run jailed rcynic" /usr/bin/crontab -l -u root | |