From c224ba7a2f2e662ec3e6d7e22a62ee0cfb3c549f Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 8 Jan 2013 03:15:48 +0000
Subject: Start work on separate RP and CA ports for FreeBSD.

svn path=/branches/tk377/; revision=4954
---
 rcynic/installation-scripts/deinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/deinstall.sh b/rcynic/installation-scripts/deinstall.sh
index 113794a4..d94d7ed8 100644
--- a/rcynic/installation-scripts/deinstall.sh
+++ b/rcynic/installation-scripts/deinstall.sh
@@ -2,4 +2,4 @@
 # $Id$
 
 echo Sorry, automated deinstallation of rcynic is not implemented yet
-exit 1
+#exit 1
-- 
cgit v1.2.3


From 5bfaa95b9c6a076bbe16966bb77c4dd42ddc5039 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 8 Jan 2013 20:03:01 +0000
Subject: Checkpoint

svn path=/branches/tk377/; revision=4959
---
 rcynic/installation-scripts/freebsd/install.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh
index 105de21b..2bcf561a 100644
--- a/rcynic/installation-scripts/freebsd/install.sh
+++ b/rcynic/installation-scripts/freebsd/install.sh
@@ -51,10 +51,8 @@ if ! rcynic_jaildir="$jaildir" rcynic_user="$jailuser" rcynic_group="$jailgroup"
     exit 1
 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 ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf"; then
-    echo "Installed minimal ${jaildir}/etc/rcynic.conf, adding SAMPLE trust anchors"
+if /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf.sample"; then
+    echo "Installed minimal ${jaildir}/etc/rcynic.conf.sample, adding SAMPLE trust anchors"
     for i in ../../sample-trust-anchors/*.tal; do
 	j="$jaildir/etc/trust-anchors/${i##*/}"
 	/bin/test -r "$i" || continue
@@ -64,9 +62,18 @@ elif /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildi
     done
     j=1
     for i in $jaildir/etc/trust-anchors/*.tal; do
-	echo >>"${jaildir}/etc/rcynic.conf" "trust-anchor-locator.$j	= /etc/trust-anchors/${i##*/}"
+	echo >>"${jaildir}/etc/rcynic.conf.sample" "trust-anchor-locator.$j	= /etc/trust-anchors/${i##*/}"
 	j=$((j+1))
     done
+else
+    echo "Installing minimal ${jaildir}/etc/rcynic.conf.sample failed"
+    exit 1
+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 /bin/cp -p "$jaildir/etc/rcynic.conf.sample" "$jaildir/etc/rcynic.conf"
+    echo "Installed minimal ${jaildir}/etc/rcynic.conf"
 else
     echo "Installing minimal ${jaildir}/etc/rcynic.conf failed"
     exit 1
-- 
cgit v1.2.3


From 9d92820a291293378e4899397ea5e234b8603224 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 9 Jan 2013 16:59:08 +0000
Subject: More fun with pkg-install.

svn path=/branches/tk377/; revision=4962
---
 rcynic/installation-scripts/freebsd/rc.d.rcynic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
index 73e6efda..69c97ce6 100755
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ b/rcynic/installation-scripts/freebsd/rc.d.rcynic
@@ -12,7 +12,7 @@ name="rcynic"
 start_cmd="rcynic_start"
 stop_cmd="rcynic_stop"
 
-: ${rcynic_jaildir="/var/rcynic"}
+: ${rcynic_jaildir="/usr/local/var/rcynic"}
 : ${rcynic_user="rcynic"}
 : ${rcynic_group="rcynic"}
 
-- 
cgit v1.2.3


From fe9fd5c229a0b8de234e581cd906b408f171dc42 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 9 Jan 2013 18:08:33 +0000
Subject: I guess it helps to create the parent directory too.

svn path=/branches/tk377/; revision=4964
---
 rcynic/installation-scripts/freebsd/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh
index 2bcf561a..ac0a0504 100644
--- a/rcynic/installation-scripts/freebsd/install.sh
+++ b/rcynic/installation-scripts/freebsd/install.sh
@@ -34,7 +34,7 @@ else
 fi
 
 if ! /bin/test -d "${jaildir}"; then
-    /bin/mkdir "${jaildir}"
+    /bin/mkdir -p "${jaildir}"
 fi
 
 if /usr/bin/install -m 555 -o root -g wheel -p rc.d.rcynic ${DESTDIR}/usr/local/etc/rc.d/rcynic; then
-- 
cgit v1.2.3


From 2a2d0d8ca7f03a73808c9857c78a6ce13e95e9f9 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Wed, 9 Jan 2013 20:08:58 +0000
Subject: Doh.

svn path=/branches/tk377/; revision=4965
---
 rcynic/installation-scripts/freebsd/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh
index ac0a0504..7f3e9f02 100644
--- a/rcynic/installation-scripts/freebsd/install.sh
+++ b/rcynic/installation-scripts/freebsd/install.sh
@@ -72,7 +72,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 /bin/cp -p "$jaildir/etc/rcynic.conf.sample" "$jaildir/etc/rcynic.conf"
+elif /bin/cp -p "$jaildir/etc/rcynic.conf.sample" "$jaildir/etc/rcynic.conf"; then
     echo "Installed minimal ${jaildir}/etc/rcynic.conf"
 else
     echo "Installing minimal ${jaildir}/etc/rcynic.conf failed"
-- 
cgit v1.2.3


From ddc122bdff0591ad350a985beed14cdde6a8fd73 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 12 Jan 2013 01:50:45 +0000
Subject: Using @cwd in FreeBSD pkg-plist seems to work, and is much less of a
 change from what has until now been standard practice, so going with that.

svn path=/branches/tk377/; revision=4967
---
 rcynic/installation-scripts/freebsd/rc.d.rcynic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
index 69c97ce6..73e6efda 100755
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ b/rcynic/installation-scripts/freebsd/rc.d.rcynic
@@ -12,7 +12,7 @@ name="rcynic"
 start_cmd="rcynic_start"
 stop_cmd="rcynic_stop"
 
-: ${rcynic_jaildir="/usr/local/var/rcynic"}
+: ${rcynic_jaildir="/var/rcynic"}
 : ${rcynic_user="rcynic"}
 : ${rcynic_group="rcynic"}
 
-- 
cgit v1.2.3


From e91f49d5de88cd0bc43d73083b99c82f43aa8034 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 18 Jan 2013 05:50:47 +0000
Subject: Hack Linux installation script to work under fakeroot.

svn path=/branches/tk377/; revision=4973
---
 rcynic/installation-scripts/linux/install.sh | 41 ++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 9 deletions(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/linux/install.sh b/rcynic/installation-scripts/linux/install.sh
index 3c9a6412..143f8e1a 100644
--- a/rcynic/installation-scripts/linux/install.sh
+++ b/rcynic/installation-scripts/linux/install.sh
@@ -10,9 +10,21 @@
 : ${jailgroup="rcynic"}
 : ${setupcron="NO"}
 
+echo "Checking whether we are running under fakeroot"
+
+if test `whoami` = `(unset LD_PRELOAD; whoami)`
+then
+    running_fakeroot=no
+else
+    running_fakeroot=yes
+fi
+
 echo "Setting up \"${jaildir}\" as a chroot jail for rcynic."
 
-if ${AWK} -F: -v jailgroup="${jailgroup}" 'BEGIN {status = 1} $1 == jailgroup {status = 0} END {exit status}' /etc/group
+if test $running_fakeroot = yes
+then
+    echo "Running under fakeroot, so skipping ${jailgroup} group setup"
+elif ${AWK} -F: -v jailgroup="${jailgroup}" 'BEGIN {status = 1} $1 == jailgroup {status = 0} END {exit status}' /etc/group
 then
     echo "You already have a group \"${jailgroup}\", so I will use it."
 elif /usr/sbin/groupadd ${jailgroup}
@@ -34,7 +46,10 @@ if test -f /etc/redhat-release; then
 	fi
 fi
 
-if ${AWK} -F: -v jailuser="${jailuser}" 'BEGIN {status = 1} $1 == jailuser {status = 0} END {exit status}' /etc/passwd
+if test $running_fakeroot = yes
+then
+    echo "Running under fakeroot, so skipping ${jailuser} user setup"
+elif ${AWK} -F: -v jailuser="${jailuser}" 'BEGIN {status = 1} $1 == jailuser {status = 0} END {exit status}' /etc/passwd
 then
     echo "You already have a user \"${jailuser}\", so I will use it."
 elif /usr/sbin/useradd -g ${jailgroup} -M $nogroup -d "${jaildir}" -s /sbin/nologin -c "RPKI validation system" ${jailuser}
@@ -93,17 +108,21 @@ echo "Whacking file permissions"
 
 if ! /bin/chmod -R a-w "${jaildir}/bin" "${jaildir}/etc" ||
    ! /bin/chmod -R 755 "${jaildir}/data" ||
-   ! /bin/chown -R root:root "${jaildir}/bin" "${jaildir}/etc" ||
-   ! /bin/chown -R "${jailuser}:${jailgroup}" "${jaildir}/data"
+   ( test -f "${jaildir}/etc/rsa_key" && ! /bin/chmod 400 "${jaildir}/etc/rsa_key" )
 then
-    echo "Unable to set file permissions and ownerships correctly, please fix this and try again"
+    echo "Unable to set file permissions correctly, please fix this and try again"
     exit 1
 fi
 
-if test -f "${jaildir}/etc/rsa_key"
+if test $running_fakeroot = yes
+then
+    echo "Running under fakeroot, so skipping chown calls"
+elif ! /bin/chown -R root:root "${jaildir}/bin" "${jaildir}/etc" ||
+    ! /bin/chown -R "${jailuser}:${jailgroup}" "${jaildir}/data" ||
+    ( test -f "${jaildir}/etc/rsa_key" && ! /bin/chown "${jailuser}" "${jaildir}/etc/rsa_key" )
 then
-    /bin/chmod 400 "${jaildir}/etc/rsa_key"
-    /bin/chown "${jailuser}" "${jaildir}/etc/rsa_key"
+    echo "Unable to set file ownership correctly, please fix this and try again"
+    exit 1
 fi
 
 if test -r "$jaildir/etc/rcynic.conf"; then
@@ -196,10 +215,14 @@ else
     exit 1
 fi
 
-echo "Setting up root's crontab to run jailed rcynic"
+if test $running_fakeroot = yes
+then
+    setupcron=NO
+fi
 
 case "$setupcron" in
 YES|yes)
+    echo "Setting up root's crontab to run jailed rcynic"
     /usr/bin/crontab -l -u root 2>/dev/null |
     ${AWK} -v "jailuser=$jailuser" -v "jailgroup=$jailgroup" -v "jaildir=$jaildir" '
 	BEGIN {
-- 
cgit v1.2.3


From 4ef639469607b92edf8460e3df335312d46c4e86 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 18 Jan 2013 06:03:08 +0000
Subject: Get rid of "installation-manifest" Makefile target silliness.

svn path=/branches/tk377/; revision=4974
---
 rcynic/installation-scripts/deinstall.sh |  1 -
 rcynic/installation-scripts/manifest.sh  | 23 -----------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 rcynic/installation-scripts/manifest.sh

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/deinstall.sh b/rcynic/installation-scripts/deinstall.sh
index d94d7ed8..635c5acc 100644
--- a/rcynic/installation-scripts/deinstall.sh
+++ b/rcynic/installation-scripts/deinstall.sh
@@ -2,4 +2,3 @@
 # $Id$
 
 echo Sorry, automated deinstallation of rcynic is not implemented yet
-#exit 1
diff --git a/rcynic/installation-scripts/manifest.sh b/rcynic/installation-scripts/manifest.sh
deleted file mode 100644
index 26872b1a..00000000
--- a/rcynic/installation-scripts/manifest.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -
-# $Id$
-
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/bin
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/dev
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/etc
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/etc/trust-anchors
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/var
-echo >>${abs_top_builddir}/installation-manifest D %%RCYNICJAILDIR%%/data
-
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rcynic
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rsync
-echo >>${abs_top_builddir}/installation-manifest F %%RCYNICJAILDIR%%/bin/rcynic-html
-
-# Not sure what to do about %%RCYNICJAILDIR%%/${libdir}/* on Linux, as we
-# don't know what goes there until we compute the transitive closure
-# of ldd dependencies.  Ick.  Ignore for now.
-
-case "${host_os}" in
-freebsd*)	echo >>${abs_top_builddir}/installation-manifest F %%RCDIR%%/rcynic;;
-darwin*)	echo >>${abs_top_builddir}/installation-manifest F /Library/StartupItems/RCynic;;
-esac
-- 
cgit v1.2.3


From a72c2d12081a66117420d530bd6e8b4e2fc7aa90 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 18 Jan 2013 20:29:29 +0000
Subject: Defer device inode creation until package installation.

svn path=/branches/tk377/; revision=4975
---
 rcynic/installation-scripts/linux/install.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/linux/install.sh b/rcynic/installation-scripts/linux/install.sh
index 143f8e1a..039c753b 100644
--- a/rcynic/installation-scripts/linux/install.sh
+++ b/rcynic/installation-scripts/linux/install.sh
@@ -84,7 +84,10 @@ fi
 
 echo "Installing device inodes"
 
-if ! (cd /dev; /bin/ls null zero random urandom | /bin/cpio -puv "${jaildir}/dev")
+if test $running_fakeroot = yes
+then
+    echo "Running under fakeroot, so skipping ${jaildir}/dev device inode setup"
+elif ! (cd /dev; /bin/ls null zero random urandom | /bin/cpio -puv "${jaildir}/dev")
 then
     echo "Unable to install device inodes in ${jaildir}/dev/, please fix this then try again"
     exit 1
@@ -116,7 +119,7 @@ fi
 
 if test $running_fakeroot = yes
 then
-    echo "Running under fakeroot, so skipping chown calls"
+    echo "Running under fakeroot, so skipping ${jaildir} chown calls"
 elif ! /bin/chown -R root:root "${jaildir}/bin" "${jaildir}/etc" ||
     ! /bin/chown -R "${jailuser}:${jailgroup}" "${jaildir}/data" ||
     ( test -f "${jaildir}/etc/rsa_key" && ! /bin/chown "${jailuser}" "${jaildir}/etc/rsa_key" )
-- 
cgit v1.2.3


From b7c329cb97367a670a36dd9c50a3f761dd2b4963 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Thu, 31 Jan 2013 05:03:04 +0000
Subject: Checkpoint

svn path=/branches/tk377/; revision=4988
---
 rcynic/installation-scripts/deinstall.sh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 rcynic/installation-scripts/deinstall.sh

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/deinstall.sh b/rcynic/installation-scripts/deinstall.sh
deleted file mode 100644
index 635c5acc..00000000
--- a/rcynic/installation-scripts/deinstall.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -
-# $Id$
-
-echo Sorry, automated deinstallation of rcynic is not implemented yet
-- 
cgit v1.2.3


From 27d85628a8ebe96c3adc2dbeac0e58160c727071 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 1 Feb 2013 18:38:48 +0000
Subject: Checkpoint

svn path=/branches/tk377/; revision=5001
---
 rcynic/installation-scripts/darwin/RCynic/RCynic   |  80 ------
 .../darwin/RCynic/StartupParameters.plist          |  19 --
 rcynic/installation-scripts/darwin/install.sh      | 193 --------------
 rcynic/installation-scripts/freebsd/install.sh     | 158 ------------
 rcynic/installation-scripts/freebsd/rc.d.rcynic    |  76 ------
 rcynic/installation-scripts/install.sh             |  14 -
 rcynic/installation-scripts/linux/install.sh       | 281 ---------------------
 rcynic/installation-scripts/sample-rcynic.conf     |  27 --
 8 files changed, 848 deletions(-)
 delete mode 100755 rcynic/installation-scripts/darwin/RCynic/RCynic
 delete mode 100644 rcynic/installation-scripts/darwin/RCynic/StartupParameters.plist
 delete mode 100644 rcynic/installation-scripts/darwin/install.sh
 delete mode 100644 rcynic/installation-scripts/freebsd/install.sh
 delete mode 100755 rcynic/installation-scripts/freebsd/rc.d.rcynic
 delete mode 100644 rcynic/installation-scripts/install.sh
 delete mode 100644 rcynic/installation-scripts/linux/install.sh
 delete mode 100644 rcynic/installation-scripts/sample-rcynic.conf

(limited to 'rcynic/installation-scripts')

diff --git a/rcynic/installation-scripts/darwin/RCynic/RCynic b/rcynic/installation-scripts/darwin/RCynic/RCynic
deleted file mode 100755
index 0237f926..00000000
--- a/rcynic/installation-scripts/darwin/RCynic/RCynic
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh -
-#
-# $Id$
-#
-. /etc/rc.common
-
-name="rcynic"
-start_cmd="rcynic_start"
-stop_cmd="rcynic_stop"
-
-: ${rcynic_jaildir="/var/rcynic"}
-: ${rcynic_user="rcynic"}
-: ${rcynic_group="rcynic"}
-
-StartService()
-{
-	/bin/test -d "${rcynic_jaildir}" || /bin/mkdir "${rcynic_jaildir}"
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-
-	/usr/sbin/mtree -deU -p "${rcynic_jaildir}" <<EOF
-
-		/set type=dir uname=root gname=wheel mode=0555
-		.
-			bin
-			..
-			dev
-			..
-			etc
-				trust-anchors
-				..
-			..
-			usr
-				lib
-					system
-					..
-				..
-			..
-			var
-				run
-				..
-			..
-			data	uname=${rcynic_user} gname=${rcynic_group} mode=0755
-			..
-		..
-EOF
-
-	/bin/chmod -R a-w "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-	/usr/sbin/chown -R root:wheel "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-
-	if /bin/test -f "${rcynic_jaildir}/etc/rsa_key"; then
-		/bin/chmod 400 "${rcynic_jaildir}/etc/rsa_key"
-		/usr/sbin/chown "${rcynic_user}" "${rcynic_jaildir}/etc/rsa_key"
-	fi
-
-	if ! /sbin/mount_devfs devfs "${rcynic_jaildir}/dev"; then
-		echo "Mounting devfs on ${rcynic_jaildir}/dev failed..."
-		exit 1
-	fi
-
-	for i in /etc/localtime /etc/resolv.conf; do
-		j="${rcynic_jaildir}${i}"
-		if /bin/test -r "$i" && ! /usr/bin/cmp -s "$i" "$j"; then
-			/usr/bin/install -m 444 -o root -g wheel -p "$i" "$j"
-		fi
-	done
-
-	/bin/ln -f /var/run/mDNSResponder "${rcynic_jaildir}/var/run/mDNSResponder"
-}
-
-StopService()
-{
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-}
-
-RestartService()
-{
-	StartService
-}
-
-RunService "$1"
diff --git a/rcynic/installation-scripts/darwin/RCynic/StartupParameters.plist b/rcynic/installation-scripts/darwin/RCynic/StartupParameters.plist
deleted file mode 100644
index ca46b676..00000000
--- a/rcynic/installation-scripts/darwin/RCynic/StartupParameters.plist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Description</key>
-	<string>RCynic Setup</string>
-	<key>OrderPreference</key>
-	<string>None</string>
-	<key>Provides</key>
-	<array>
-		<string>RCynic</string>
-	</array>
-	<key>Uses</key>
-	<array>
-		<string>Network</string>
-		<string>Resolver</string>
-	</array>
-	</dict>
-</plist>
diff --git a/rcynic/installation-scripts/darwin/install.sh b/rcynic/installation-scripts/darwin/install.sh
deleted file mode 100644
index 1af4a6f0..00000000
--- a/rcynic/installation-scripts/darwin/install.sh
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Create a chroot jail for rcynic.
-#
-# This is approximately what a pkg-install script might do if this were
-# a FreeBSD port.  Perhaps some day it will be.
-
-: ${jaildir="${DESTDIR}/var/rcynic"}
-: ${jailuser="rcynic"}
-: ${jailgroup="rcynic"}
-: ${jailname="RPKI Validation System"}
-: ${setupcron="NO"}
-
-echo "Setting up \"${jaildir}\" as a chroot jail for rcynic."
-
-if /usr/bin/dscl . -read "/Groups/${jailgroup}" >/dev/null 2>&1
-then
-    echo "You already have a group \"${jailgroup}\", so I will use it."
-elif gid="$(/usr/bin/dscl . -list /Groups PrimaryGroupID | /usr/bin/awk 'BEGIN {gid = 501} $2 >= gid {gid = 1 + $2} END {print gid}')" &&
-    /usr/bin/dscl . -create "/Groups/${jailgroup}" &&
-    /usr/bin/dscl . -create "/Groups/${jailgroup}" RealName "${jailname}" &&
-    /usr/bin/dscl . -create "/Groups/${jailgroup}" PrimaryGroupID "$gid" &&
-    /usr/bin/dscl . -create "/Groups/${jailgroup}" GeneratedUID "$(/usr/bin/uuidgen)" &&
-    /usr/bin/dscl . -create "/Groups/${jailgroup}" Password "*"
-then
-    echo "Added group \"${jailgroup}\"."
-else
-    echo "Adding group \"${jailgroup}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-if /usr/bin/dscl . -read "/Users/${jailuser}" >/dev/null 2>&1
-then
-    echo "You already have a user \"${jailuser}\", so I will use it."
-elif uid="$(/usr/bin/dscl . -list /Users UniqueID | /usr/bin/awk 'BEGIN {uid = 501} $2 >= uid {uid = 1 + $2} END {print uid}')" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" UserShell "/usr/bin/false" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" RealName "${jailname}" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" UniqueID "$uid" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" PrimaryGroupID "$gid" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" NFSHomeDirectory "/var/empty" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" GeneratedUID "$(/usr/bin/uuidgen)" &&
-    /usr/bin/dscl . -create "/Users/${jailuser}" Password "*"
-then
-    echo "Added user \"${jailuser}\"."
-else
-    echo "Adding user \"${jailuser}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-if ! /bin/test -d "${jaildir}"; then
-    /bin/mkdir "${jaildir}"
-fi
-
-if /usr/bin/install -o root -g wheel -d ${DESTDIR}/Library/StartupItems/RCynic &&
-   /usr/bin/install -o root -g wheel -m 555 RCynic/RCynic RCynic/StartupParameters.plist ${DESTDIR}/Library/StartupItems/RCynic; then
-    echo "Installed ${DESTDIR}/Library/StartupItems/RCynic"
-else
-    echo "Installing ${DESTDIR}/Library/StartupItems/RCynic failed"
-    exit 1
-fi
-
-echo "Running ${DESTDIR}/Library/StartupItems/RCynic/RCynic to set up directories"
-
-if ! rcynic_jaildir="$jaildir" rcynic_user="$jailuser" rcynic_group="$jailgroup"  /Library/StartupItems/RCynic/RCynic start; then
-    echo "Directory setup failed"
-    exit 1
-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 ../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/*.tal; do
-	j="$jaildir/etc/trust-anchors/${i##*/}"
-	/bin/test -r "$i" || continue
-	/bin/test -r "$j" && continue
-	echo "Installing $i as $j"
-	/usr/bin/install -m 444 -o root -g wheel -p "$i" "$j"
-    done
-    j=1
-    for i in $jaildir/etc/trust-anchors/*.tal; do
-	echo >>"${jaildir}/etc/rcynic.conf" "trust-anchor-locator.$j	= /etc/trust-anchors/${i##*/}"
-	j=$((j+1))
-    done
-else
-    echo "Installing minimal ${jaildir}/etc/rcynic.conf failed"
-    exit 1
-fi
-
-echo "Installing rcynic as ${jaildir}/bin/rcynic"
-
-/usr/bin/install -m 555 -o root -g wheel -p ../../rcynic "${jaildir}/bin/rcynic"
-
-if /bin/test -x "$jaildir/bin/rsync"; then
-    echo "You already have an executable \"$jaildir/bin/rsync\", so I will use it"
-elif /usr/bin/install -m 555 -o root -g wheel -p /usr/bin/rsync "${jaildir}/bin/rsync"; then
-    echo "Installed ${jaildir}/bin/rsync"
-else
-    echo "Installing ${jaildir}/bin/rsync failed"
-    exit 1
-fi
-
-echo "Copying required shared libraries" 
-
-shared_libraries="${jaildir}/bin/rcynic ${jaildir}/bin/rsync"
-while true
-do
-    closure="$(/usr/bin/otool -L ${shared_libraries} | /usr/bin/awk '/:$/ {next} {print $1}' | /usr/bin/sort -u)"
-    if test "x$shared_libraries" = "x$closure"
-    then
-	break
-    else
-	shared_libraries="$closure"
-    fi
-done
-
-for shared in /usr/lib/dyld $shared_libraries
-do
-    if /bin/test -r "${jaildir}/${shared}"
-    then
-	echo "You already have a \"${jaildir}/${shared}\", so I will use it"
-    elif /usr/bin/install -m 555 -o root -g wheel -p "${shared}" "${jaildir}/${shared}"
-    then
-	echo "Copied ${shared} into ${jaildir}"
-    else
-        echo "Unable to copy ${shared} into ${jaildir}"
-	exit 1
-    fi
-done
-
-if /usr/bin/install -m 555 -o root -g wheel -p ../../rcynic-html "${jaildir}/bin/rcynic-html"; then
-    echo "Installed rcynic.py as \"${jaildir}/bin/rcynic-html\""
-else
-    echo "Installing rcynic-html failed"
-    exit 1
-fi
-
-echo "Setting up root's crontab to run jailed rcynic"
-
-case "$setupcron" in
-YES|yes)
-    /usr/bin/crontab -l -u root 2>/dev/null |
-    /usr/bin/awk -v "jailuser=$jailuser" -v "jailgroup=$jailgroup" -v "jaildir=$jaildir" '
-	BEGIN {
-	    cmd = "exec /usr/sbin/chroot -u " jailuser " -g " jailgroup " " jaildir;
-	    cmd = cmd " /bin/rcynic -c /etc/rcynic.conf";
-	}
-	$0 !~ cmd {
-	    print;
-	}
-	END {
-	    "/usr/bin/hexdump -n 2 -e \"\\\"%u\\\\\\n\\\"\" /dev/random" | getline;
-	    printf "%u * * * *\t%s\n", $1 % 60, cmd;
-	}' |
-    /usr/bin/crontab -u root -
-    /bin/cat <<EOF
-
-	crontab is set up to run rcynic hourly, at a randomly selected
-	minute (to spread load on the rsync servers).  Please do NOT
-	adjust this to run on the hour.  In particular please do NOT
-	adjust this to run at midnight UTC.
-EOF
-    ;;
-
-*)
-    /bin/cat <<EOF
-
-	You'll need to add a crontab entry running the following command as root:
-
-	    /usr/sbin/chroot -u $jailuser -g $jailgroup $jaildir /bin/rcynic -c /etc/rcynic.conf
-
-	Please try to pick a random time for this, don't just run it on the hour,
-	or at local midnight, or, worst of all, at midnight UTC.
-
-EOF
-    ;;
-
-esac
-
-/bin/cat <<EOF
-
-	Jail set up. You may need to customize $jaildir/etc/rcynic.conf.
-	If you did not install your own trust anchors, a default set
-	of SAMPLE trust anchors may have been installed for you, but
-	you, the relying party, are the only one who can decide
-	whether you trust those anchors.  rcynic will not do anything
-	useful without good trust anchors.
-
-EOF
diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh
deleted file mode 100644
index 7f3e9f02..00000000
--- a/rcynic/installation-scripts/freebsd/install.sh
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Create a chroot jail for rcynic.
-#
-# This is approximately what a pkg-install script might do if this were
-# a FreeBSD port.  Perhaps some day it will be.
-
-: ${jaildir="${DESTDIR}/var/rcynic"}
-: ${jailuser="rcynic"}
-: ${jailgroup="rcynic"}
-: ${setupcron="NO"}
-
-echo "Setting up \"${jaildir}\" as a chroot jail for rcynic."
-
-if /usr/sbin/pw groupshow "${jailgroup}" 2>/dev/null; then
-    echo "You already have a group \"${jailgroup}\", so I will use it."
-elif /usr/sbin/pw groupadd ${jailgroup}; then
-    echo "Added group \"${jailgroup}\"."
-else
-    echo "Adding group \"${jailgroup}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-if /usr/sbin/pw usershow "${jailuser}" 2>/dev/null; then
-    echo "You already have a user \"${jailuser}\", so I will use it."
-elif /usr/sbin/pw useradd ${jailuser} -g ${jailgroup} -h - -d /nonexistant -s /usr/sbin/nologin -c "RPKI validation system"; then
-    echo "Added user \"${jailuser}\"."
-else
-    echo "Adding user \"${jailuser}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-if ! /bin/test -d "${jaildir}"; then
-    /bin/mkdir -p "${jaildir}"
-fi
-
-if /usr/bin/install -m 555 -o root -g wheel -p rc.d.rcynic ${DESTDIR}/usr/local/etc/rc.d/rcynic; then
-    echo "Installed rc.d.rcynic as ${DESTDIR}/usr/local/etc/rc.d/rcynic"
-else
-    echo "Installing ${DESTDIR}/usr/local/etc/rc.d/rcynic failed"
-    exit 1
-fi
-
-echo "Running /usr/local/etc/rc.d/rcynic to set up directories"
-
-if ! rcynic_jaildir="$jaildir" rcynic_user="$jailuser" rcynic_group="$jailgroup" /bin/sh /usr/local/etc/rc.d/rcynic start; then
-    echo "Directory setup failed"
-    exit 1
-fi
-
-if /usr/bin/install -m 444 -o root -g wheel -p ../sample-rcynic.conf "${jaildir}/etc/rcynic.conf.sample"; then
-    echo "Installed minimal ${jaildir}/etc/rcynic.conf.sample, adding SAMPLE trust anchors"
-    for i in ../../sample-trust-anchors/*.tal; do
-	j="$jaildir/etc/trust-anchors/${i##*/}"
-	/bin/test -r "$i" || continue
-	/bin/test -r "$j" && continue
-	echo "Installing $i as $j"
-	/usr/bin/install -m 444 -o root -g wheel -p "$i" "$j"
-    done
-    j=1
-    for i in $jaildir/etc/trust-anchors/*.tal; do
-	echo >>"${jaildir}/etc/rcynic.conf.sample" "trust-anchor-locator.$j	= /etc/trust-anchors/${i##*/}"
-	j=$((j+1))
-    done
-else
-    echo "Installing minimal ${jaildir}/etc/rcynic.conf.sample failed"
-    exit 1
-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 /bin/cp -p "$jaildir/etc/rcynic.conf.sample" "$jaildir/etc/rcynic.conf"; then
-    echo "Installed minimal ${jaildir}/etc/rcynic.conf"
-else
-    echo "Installing minimal ${jaildir}/etc/rcynic.conf failed"
-    exit 1
-fi
-
-echo "Installing rcynic as ${jaildir}/bin/rcynic"
-
-/usr/bin/install -m 555 -o root -g wheel -p ../../rcynic "${jaildir}/bin/rcynic"
-
-if /bin/test ! -x "$jaildir/bin/rsync" -a ! -x ../../static-rsync/rsync; then
-    echo "Building static rsync for jail, this may take a little while"
-    (cd ../../static-rsync && exec make)
-fi
-
-if /bin/test -x "$jaildir/bin/rsync"; then
-    echo "You already have an executable \"$jaildir/bin/rsync\", so I will use it"
-elif /usr/bin/install -m 555 -o root -g wheel -p ../../static-rsync/rsync "${jaildir}/bin/rsync"; then
-    echo "Installed static rsync as \"${jaildir}/bin/rsync\""
-else
-    echo "Installing static rsync failed"
-    exit 1
-fi
-
-if /usr/bin/install -m 555 -o root -g wheel -p ../../rcynic-html "${jaildir}/bin/rcynic-html"; then
-    echo "Installed rcynic.py as \"${jaildir}/bin/rcynic-html\""
-else
-    echo "Installing rcynic-html failed"
-    exit 1
-fi
-
-echo "Setting up root's crontab to run jailed rcynic"
-
-case "$setupcron" in
-YES|yes)
-    /usr/bin/crontab -l -u root 2>/dev/null |
-    /usr/bin/awk -v "jailuser=$jailuser" -v "jailgroup=$jailgroup" -v "jaildir=$jaildir" '
-	BEGIN {
-	    cmd = "exec /usr/sbin/chroot -u " jailuser " -g " jailgroup " " jaildir;
-	    cmd = cmd " /bin/rcynic -c /etc/rcynic.conf";
-	}
-	$0 !~ cmd {
-	    print;
-	}
-	END {
-	    "/usr/bin/hexdump -n 2 -e \"\\\"%u\\\\\\n\\\"\" /dev/random" | getline;
-	    printf "%u * * * *\t%s\n", $1 % 60, cmd;
-	}' |
-    /usr/bin/crontab -u root -
-    /bin/cat <<EOF
-
-	crontab is set up to run rcynic hourly, at a randomly selected
-	minute (to spread load on the rsync servers).  Please do NOT
-	adjust this to run on the hour.  In particular please do NOT
-	adjust this to run at midnight UTC.
-EOF
-    ;;
-
-*)
-    /bin/cat <<EOF
-
-	You'll need to add a crontab entry running the following command as root:
-
-	    /usr/sbin/chroot -u $jailuser -g $jailgroup $jaildir /bin/rcynic -c /etc/rcynic.conf
-
-	Please try to pick a random time for this, don't just run it on the hour,
-	or at local midnight, or, worst of all, at midnight UTC.
-
-EOF
-    ;;
-
-esac
-
-/bin/cat <<EOF
-
-	Jail set up. You may need to customize $jaildir/etc/rcynic.conf.
-	If you did not install your own trust anchors, a default set
-	of SAMPLE trust anchors may have been installed for you, but
-	you, the relying party, are the only one who can decide
-	whether you trust those anchors.  rcynic will not do anything
-	useful without good trust anchors.
-
-EOF
diff --git a/rcynic/installation-scripts/freebsd/rc.d.rcynic b/rcynic/installation-scripts/freebsd/rc.d.rcynic
deleted file mode 100755
index 73e6efda..00000000
--- a/rcynic/installation-scripts/freebsd/rc.d.rcynic
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh -
-#
-# $Id$
-#
-# PROVIDE: rcynic
-# REQUIRE: DAEMON
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="rcynic"
-start_cmd="rcynic_start"
-stop_cmd="rcynic_stop"
-
-: ${rcynic_jaildir="/var/rcynic"}
-: ${rcynic_user="rcynic"}
-: ${rcynic_group="rcynic"}
-
-rcynic_start()
-{
-	/bin/test -d "${rcynic_jaildir}" || /bin/mkdir "${rcynic_jaildir}"
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-
-	/usr/sbin/mtree -deU -p "${rcynic_jaildir}" <<EOF
-
-		/set type=dir uname=root gname=wheel mode=0555
-		.
-			bin
-			..
-			dev
-			..
-			etc
-				trust-anchors
-				..
-			..
-			var
-				run
-				..
-			..
-			data	uname=${rcynic_user} gname=${rcynic_group} mode=0755
-			..
-		..
-EOF
-
-	/bin/chmod -R a-w "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-	/usr/sbin/chown -R root:wheel "${rcynic_jaildir}/bin" "${rcynic_jaildir}/etc"
-
-	if /bin/test -f "${rcynic_jaildir}/etc/rsa_key"; then
-		/bin/chmod 400 "${rcynic_jaildir}/etc/rsa_key"
-		/usr/sbin/chown "${rcynic_user}" "${rcynic_jaildir}/etc/rsa_key"
-	fi
-
-	if ! /sbin/mount -t devfs dev "${rcynic_jaildir}/dev"; then
-		echo "Mounting devfs on ${rcynic_jaildir}/dev failed..."
-		exit 1
-	fi
-
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply hide
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply path null unhide
-	/sbin/devfs -m "${rcynic_jaildir}/dev" rule apply path random unhide
-
-	for i in /etc/localtime /etc/resolv.conf; do
-		j="${rcynic_jaildir}${i}"
-		if /bin/test -r "$i" && ! /usr/bin/cmp -s "$i" "$j"; then
-			/usr/bin/install -m 444 -o root -g wheel -p "$i" "$j"
-		fi
-	done
-}
-
-rcynic_stop()
-{
-	/sbin/umount "${rcynic_jaildir}/dev" 2>/dev/null
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/rcynic/installation-scripts/install.sh b/rcynic/installation-scripts/install.sh
deleted file mode 100644
index 8c708a28..00000000
--- a/rcynic/installation-scripts/install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -
-# $Id$
-
-set -e
-
-case "${host_os}" in
-
-freebsd*) cd freebsd; . ./install.sh;;
-darwin*)  cd darwin;  . ./install.sh;;
-linux*)	  cd linux;   . ./install.sh;;
-
-*)	echo 1>&2 "Don't know how to install rcynic jail on platform ${host_os}"
-	exit 1;;
-esac
diff --git a/rcynic/installation-scripts/linux/install.sh b/rcynic/installation-scripts/linux/install.sh
deleted file mode 100644
index 039c753b..00000000
--- a/rcynic/installation-scripts/linux/install.sh
+++ /dev/null
@@ -1,281 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Create a chroot jail for rcynic.
-#
-# This is approximately what a package installation script might do.
-
-: ${jaildir="${DESTDIR}/var/rcynic"}
-: ${jailuser="rcynic"}
-: ${jailgroup="rcynic"}
-: ${setupcron="NO"}
-
-echo "Checking whether we are running under fakeroot"
-
-if test `whoami` = `(unset LD_PRELOAD; whoami)`
-then
-    running_fakeroot=no
-else
-    running_fakeroot=yes
-fi
-
-echo "Setting up \"${jaildir}\" as a chroot jail for rcynic."
-
-if test $running_fakeroot = yes
-then
-    echo "Running under fakeroot, so skipping ${jailgroup} group setup"
-elif ${AWK} -F: -v jailgroup="${jailgroup}" 'BEGIN {status = 1} $1 == jailgroup {status = 0} END {exit status}' /etc/group
-then
-    echo "You already have a group \"${jailgroup}\", so I will use it."
-elif /usr/sbin/groupadd ${jailgroup}
-then
-    echo "Added group \"${jailgroup}\"."
-else
-    echo "Adding group \"${jailgroup}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-# The adduser program on CentOS 5.x uses the -n flag instead of -N to
-# avoid creating the associated group.
-nogroup='-N'
-if test -f /etc/redhat-release; then
-	read vendor release version < /etc/redhat-release 
-	if test $vendor = CentOS; then
-		nogroup='-n'
-	fi
-fi
-
-if test $running_fakeroot = yes
-then
-    echo "Running under fakeroot, so skipping ${jailuser} user setup"
-elif ${AWK} -F: -v jailuser="${jailuser}" 'BEGIN {status = 1} $1 == jailuser {status = 0} END {exit status}' /etc/passwd
-then
-    echo "You already have a user \"${jailuser}\", so I will use it."
-elif /usr/sbin/useradd -g ${jailgroup} -M $nogroup -d "${jaildir}" -s /sbin/nologin -c "RPKI validation system" ${jailuser}
-then
-    echo "Added user \"${jailuser}\"."
-else
-    echo "Adding user \"${jailuser}\" failed..."
-    echo "Please create it, then try again."
-    exit 1
-fi
-
-# test for x86_64 target
-if test -d /lib64; then
-    libdir=/lib64
-else
-    libdir=/lib
-fi
-    
-echo "Building directories"
-
-if ! /bin/mkdir -p -v -m 555		\
-    "${jaildir}/bin"			\
-    "${jaildir}/dev"			\
-    "${jaildir}/etc/trust-anchors"	\
-    "${jaildir}/${libdir}"		\
-    "${jaildir}/usr/lib"		\
-    "${jaildir}/data"
-then
-    echo "Unable to build directories under \"${jaildir}\", please fix this then try again."
-    exit 1
-fi
-
-echo "Installing device inodes"
-
-if test $running_fakeroot = yes
-then
-    echo "Running under fakeroot, so skipping ${jaildir}/dev device inode setup"
-elif ! (cd /dev; /bin/ls null zero random urandom | /bin/cpio -puv "${jaildir}/dev")
-then
-    echo "Unable to install device inodes in ${jaildir}/dev/, please fix this then try again"
-    exit 1
-fi
-
-echo "Copying files from /etc"
-
-for i in /etc/localtime /etc/resolv.conf /etc/passwd /etc/group
-do
-    j="${jaildir}${i}"
-    if test -r "$i" &&
-	! /usr/bin/cmp -s "$i" "$j" &&
-	! /bin/cp -p "$i" "$j"
-    then
-	echo "Unable to copy $i to ${jaildir}, please fix this then try again"
-	exit 1
-    fi
-done
-
-echo "Whacking file permissions"
-
-if ! /bin/chmod -R a-w "${jaildir}/bin" "${jaildir}/etc" ||
-   ! /bin/chmod -R 755 "${jaildir}/data" ||
-   ( test -f "${jaildir}/etc/rsa_key" && ! /bin/chmod 400 "${jaildir}/etc/rsa_key" )
-then
-    echo "Unable to set file permissions correctly, please fix this and try again"
-    exit 1
-fi
-
-if test $running_fakeroot = yes
-then
-    echo "Running under fakeroot, so skipping ${jaildir} chown calls"
-elif ! /bin/chown -R root:root "${jaildir}/bin" "${jaildir}/etc" ||
-    ! /bin/chown -R "${jailuser}:${jailgroup}" "${jaildir}/data" ||
-    ( test -f "${jaildir}/etc/rsa_key" && ! /bin/chown "${jailuser}" "${jaildir}/etc/rsa_key" )
-then
-    echo "Unable to set file ownership correctly, please fix this and try again"
-    exit 1
-fi
-
-if 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 root -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/*.tal; do
-	j="$jaildir/etc/trust-anchors/${i##*/}"
-	test -r "$i" || continue
-	test -r "$j" && continue
-	echo "Installing $i as $j"
-	/usr/bin/install -m 444 -o root -g root -p "$i" "$j"
-    done
-    j=1
-    for i in $jaildir/etc/trust-anchors/*.tal; do
-	echo >>"${jaildir}/etc/rcynic.conf" "trust-anchor-locator.$j	= /etc/trust-anchors/${i##*/}"
-	j=$((j+1))
-    done
-else
-    echo "Installing minimal ${jaildir}/etc/rcynic.conf failed"
-    exit 1
-fi
-
-echo "Installing rcynic as ${jaildir}/bin/rcynic"
-
-/usr/bin/install -m 555 -o root -g root -p ../../rcynic "${jaildir}/bin/rcynic"
-
-if test -x "$jaildir/bin/rsync"; then
-    echo "You already have an executable \"$jaildir/bin/rsync\", so I will use it"
-elif /usr/bin/install -m 555 -o root -g root -p /usr/bin/rsync "${jaildir}/bin/rsync"; then
-    echo "Installed ${jaildir}/bin/rsync"
-else
-    echo "Installing ${jaildir}/bin/rsync failed"
-    exit 1
-fi
-
-echo "Copying required shared libraries" 
-
-shared_libraries="${jaildir}/bin/rcynic ${jaildir}/bin/rsync $(/usr/bin/find ${libdir} -name 'libnss*.so*' -print)"
-while true
-do
-    closure="$(/usr/bin/ldd ${shared_libraries} |
-	       ${AWK} -v "rcynic=${jaildir}/bin/rcynic" -v "rsync=${jaildir}/bin/rsync" '
-		  {
-			sub(/:$/, "");
-		  }
-		  $0 == rcynic || $0 == rsync || $1 ~ /\/ld-linux\.so/ {
-			next;
-		  }
-		  {
-			for (i = 1; i <= NF; i++)
-			    if ($i ~ /^\//)
-				print $i;
-		  }
-	       ' |
-	       ${SORT} -u)"
-    if test "x$shared_libraries" = "x$closure"
-    then
-	break
-    else
-	shared_libraries="$closure"
-    fi
-done
-
-# Under CentOS 5.5, rsync requires libresolv, but ldd doesn't show
-# it.
-if test -f ${libdir}/libresolv.so.2; then
-    shared_libraries="${shared_libraries} ${libdir}/libresolv.so.2"
-fi
-
-for shared in ${libdir}/*ld*.so* $shared_libraries
-do
-    if test -r "${jaildir}/${shared}"
-    then
-	echo "You already have a \"${jaildir}${shared}\", so I will use it"
-    elif /usr/bin/install -m 555 -o root -g root -d "${jaildir}${shared%/*}" &&
-	 /usr/bin/install -m 555 -o root -g root -p "${shared}" "${jaildir}${shared}"
-    then
-	echo "Copied ${shared} into ${jaildir}"
-    else
-        echo "Unable to copy ${shared} into ${jaildir}"
-	exit 1
-    fi
-done
-
-if /usr/bin/install -m 555 -o root -g root -p ../../rcynic-html "${jaildir}/bin/rcynic-html"; then
-    echo "Installed rcynic.py as \"${jaildir}/bin/rcynic-html\""
-else
-    echo "Installing rcynic-html failed"
-    exit 1
-fi
-
-if test $running_fakeroot = yes
-then
-    setupcron=NO
-fi
-
-case "$setupcron" in
-YES|yes)
-    echo "Setting up root's crontab to run jailed rcynic"
-    /usr/bin/crontab -l -u root 2>/dev/null |
-    ${AWK} -v "jailuser=$jailuser" -v "jailgroup=$jailgroup" -v "jaildir=$jaildir" '
-	BEGIN {
-	    cmd = "exec /usr/sbin/chroot --userspec=" jailuser ":" jailgroup " " jaildir;
-	    cmd = cmd " /bin/rcynic -c /etc/rcynic.conf";
-	}
-	$0 !~ cmd {
-	    print;
-	}
-	END {
-	    "/usr/bin/hexdump -n 2 -e \"\\\"%u\\\\\\n\\\"\" /dev/random" | getline;
-	    printf "%u * * * *\t%s\n", $1 % 60, cmd;
-	}' |
-    /usr/bin/crontab -u root -
-    /bin/cat <<EOF
-
-	crontab is set up to run rcynic hourly, at a randomly selected
-	minute (to spread load on the rsync servers).  Please do NOT
-	adjust this to run on the hour.  In particular please do NOT
-	adjust this to run at midnight UTC.
-EOF
-    ;;
-
-*)
-    /bin/cat <<EOF
-
-	You'll need to add a crontab entry running one of the the following command as root:
-
-	    /usr/sbin/chroot --userspec $jailuser:$jailgroup $jaildir /bin/rcynic -c /etc/rcynic.conf
-
-	    /usr/bin/chrootuid $jaildir rcynic /bin/rcynic -c /etc/rcynic.conf
-
-	We recommend the latter, as chrootuid has proven more reliable for us than the chroot
-	program that is included on some GNU/Linux platforms.
-
-	Please try to pick a random time for this, don't just run it on the hour,
-	or at local midnight, or, worst of all, at midnight UTC.
-
-EOF
-    ;;
-
-esac
-
-/bin/cat <<EOF
-
-	Jail set up. You may need to customize $jaildir/etc/rcynic.conf.
-	If you did not install your own trust anchors, a default set
-	of SAMPLE trust anchors may have been installed for you, but
-	you, the relying party, are the only one who can decide
-	whether you trust those anchors.  rcynic will not do anything
-	useful without good trust anchors.
-
-EOF
diff --git a/rcynic/installation-scripts/sample-rcynic.conf b/rcynic/installation-scripts/sample-rcynic.conf
deleted file mode 100644
index 23a39373..00000000
--- a/rcynic/installation-scripts/sample-rcynic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#
-# Sample rcynic configuration file for jailed environment.
-
-[rcynic]
-rsync-program		= /bin/rsync
-authenticated		= /data/authenticated
-unauthenticated		= /data/unauthenticated
-lockfile		= /data/lock
-xml-summary		= /data/rcynic.xml
-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.
-- 
cgit v1.2.3