Skip to content
Browse files

dev_scripts: Install to sandbox

  • Loading branch information...
1 parent 428e39a commit 3fdf522c06d2f194a8e52dfe413f22604a43da54 Kjell-Magne Øierud committed Apr 8, 2009
Showing with 9 additions and 8 deletions.
  1. +2 −1 dev_scripts/common.sh
  2. +5 −5 dev_scripts/install
  3. +1 −1 dev_scripts/restart_munin-node
  4. +1 −1 dev_scripts/start_munin-node
View
3 dev_scripts/common.sh
@@ -1,8 +1,9 @@
#!/bin/bash
BASEDIR=$(readlink -f -- "$FINDBIN/..")
-DESTDIR="$BASEDIR/root"
+DESTDIR="$BASEDIR/sandbox"
PERLSITELIB=$(perl -V:sitelib | cut -d"'" -f2)
+
cd $BASEDIR
View
10 dev_scripts/install
@@ -6,8 +6,8 @@ FINDBIN=$(cd -- "$(dirname "$0")" && pwd)
cd $BASEDIR
if [ $1 ]; then
- rm -rf root
- mkdir root
+ rm -rf sandbox
+ mkdir sandbox
make clean
fi
@@ -22,8 +22,8 @@ if [ $1 ]; then
s|^(port .*)|\$1
tls disabled
-tls_private_key $BASEDIR/common/t/tls/master_key.pem
-tls_certificate $BASEDIR/common/t/tls/master_cert.pem
+tls_private_key $BASEDIR/common/t/tls/node_key.pem
+tls_certificate $BASEDIR/common/t/tls/node_cert.pem
tls_ca_certificate $BASEDIR/common/t/tls/CA/ca_cert.pem
tls_verify_certificate yes
tls_verify_depth 5
@@ -39,5 +39,5 @@ tls_verify_depth 5
\$1|" $DESTDIR/etc/munin/munin.conf
- PERL5LIB=$DESTDIR/$PERLSITELIB ./root/usr/sbin/munin-node-configure --shell --families=contrib,auto | sh -x
+ PERL5LIB=$DESTDIR/$PERLSITELIB $DESTDIR/usr/sbin/munin-node-configure --shell --families=contrib,auto | sh -x
fi
View
2 dev_scripts/restart_munin-node
@@ -1,4 +1,4 @@
#!/bin/bash
./dev_scripts/stop_munin-node
-./dev_scripts/start_munin-node
+./dev_scripts/start_munin-node $@
View
2 dev_scripts/start_munin-node
@@ -10,6 +10,6 @@ cd $BASEDIR
if [ -f $DESTDIR/var/run/munin/munin-node.pid ]; then
echo "Pid file found. Not starting"
else
- env PERL5LIB=$DESTDIR/$PERLSITELIB $DESTDIR/usr/sbin/munin-node
+ env PERL5LIB=$DESTDIR/$PERLSITELIB $DESTDIR/usr/sbin/munin-node $@
fi
tail -f $DESTDIR/var/log/munin/munin-node.log

0 comments on commit 3fdf522

Please sign in to comment.
Something went wrong with that request. Please try again.