Install rcynic.py instead of rcynic.xsl. Disable automatic crontab

editing in installation scripts, it doesn't do the right thing for
common case and would be better as part of an installation and
configuration wizard anyway.  Closes #234 and #229.

svn path=/trunk/; revision=4426

4 files changed, 13 insertions, 13 deletions

diff --git a/rcynic/installation-scripts/darwin/install.sh b/rcynic/installation-scripts/darwin/install.sh
index 1f0dfe7d..2c2d2b4e 100644
--- a/rcynic/installation-scripts/darwin/install.sh
+++ b/rcynic/installation-scripts/darwin/install.sh
@@ -10,7 +10,7 @@
 : ${jailuser="rcynic"}
 : ${jailgroup="rcynic"}
 : ${jailname="RPKI Validation System"}
-: ${setupcron="YES"}
+: ${setupcron="NO"}
 
 echo "Setting up \"${jaildir}\" as a chroot jail for rcynic."
 
@@ -132,10 +132,10 @@ do
     fi
 done
 
-if /usr/bin/install -m 444 -o root -g wheel -p ../../rcynic.xsl "${jaildir}/etc/rcynic.xsl"; then
-    echo "Installed rcynic.xsl as \"${jaildir}/etc/rcynic.xsl\""
+if /usr/bin/install -m 444 -o root -g wheel -p ../../rcynic.py "${jaildir}/etc/rcynic.py"; then
+    echo "Installed rcynic.py as \"${jaildir}/etc/rcynic.py\""
 else
-    echo "Installing rcynic.xsl failed"
+    echo "Installing rcynic.py failed"
     exit 1
 fi
 
diff --git a/rcynic/installation-scripts/freebsd/install.sh b/rcynic/installation-scripts/freebsd/install.sh
index 6c3453cb..b78ded2d 100644
--- a/rcynic/installation-scripts/freebsd/install.sh
+++ b/rcynic/installation-scripts/freebsd/install.sh
@@ -90,10 +90,10 @@ else
     exit 1
 fi
 
-if /usr/bin/install -m 444 -o root -g wheel -p ../../rcynic.xsl "${jaildir}/etc/rcynic.xsl"; then
-    echo "Installed rcynic.xsl as \"${jaildir}/etc/rcynic.xsl\""
+if /usr/bin/install -m 444 -o root -g wheel -p ../../rcynic.py "${jaildir}/etc/rcynic.py"; then
+    echo "Installed rcynic.py as \"${jaildir}/etc/rcynic.py\""
 else
-    echo "Installing rcynic.xsl failed"
+    echo "Installing rcynic.py failed"
     exit 1
 fi
 
diff --git a/rcynic/installation-scripts/linux/install.sh.in b/rcynic/installation-scripts/linux/install.sh.in
index f0bdc505..9d6cddb0 100644
--- a/rcynic/installation-scripts/linux/install.sh.in
+++ b/rcynic/installation-scripts/linux/install.sh.in
@@ -8,7 +8,7 @@
 : ${jaildir="${DESTDIR}/var/rcynic"}
 : ${jailuser="rcynic"}
 : ${jailgroup="rcynic"}
-: ${setupcron="YES"}
+: ${setupcron="NO"}
 
 AWK='@AWK@'
 SORT='@SORT@'
@@ -175,10 +175,10 @@ do
     fi
 done
 
-if /usr/bin/install -m 444 -o root -g root -p ../../rcynic.xsl "${jaildir}/etc/rcynic.xsl"; then
-    echo "Installed rcynic.xsl as \"${jaildir}/etc/rcynic.xsl\""
+if /usr/bin/install -m 444 -o root -g root -p ../../rcynic.py "${jaildir}/etc/rcynic.py"; then
+    echo "Installed rcynic.py as \"${jaildir}/etc/rcynic.py\""
 else
-    echo "Installing rcynic.xsl failed"
+    echo "Installing rcynic.py failed"
     exit 1
 fi
 
diff --git a/rcynic/installation-scripts/sample-rcynic.conf b/rcynic/installation-scripts/sample-rcynic.conf
index 6e464e7e..23a39373 100644
--- a/rcynic/installation-scripts/sample-rcynic.conf
+++ b/rcynic/installation-scripts/sample-rcynic.conf
@@ -1,13 +1,13 @@
 # $Id$
 #
-# Sample rcynic configuration file for FreeBSD jailed environment
+# Sample rcynic configuration file for jailed environment.
 
 [rcynic]
 rsync-program		= /bin/rsync
 authenticated		= /data/authenticated
-old-authenticated	= /data/authenticated.old
 unauthenticated		= /data/unauthenticated
 lockfile		= /data/lock
+xml-summary		= /data/rcynic.xml
 jitter			= 600
 use-syslog		= true
 log-level		= log_usage_err