From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Thu, 15 Oct 2009 18:31:36 +0000 (+0000)
Subject: remove unused monitor-client init script
X-Git-Tag: Monitor-3.0-23~5
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=e283978522ef1017ed3591bdbd2aa194a59de5b1

remove unused monitor-client init script
update spec file accordingly
---

diff --git a/Monitor.spec b/Monitor.spec
index cc90984..b892f96 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -129,7 +129,7 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 #################### CLIENT 
-install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
+#install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
 install -D -m 644 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor
 install -D -m 755 timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl
 
@@ -208,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files client
 %defattr(-,root,root)
-%{_initrddir}/monitor
+#%{_initrddir}/monitor
 %{_sysconfdir}/cron.d/monitor
 /usr/bin/timeout.pl
 
diff --git a/monitor-client.init b/monitor-client.init
deleted file mode 100644
index b78a3ba..0000000
--- a/monitor-client.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# monitor  Enables the monitor account by setting up the ssh key from the enabled PLC.
-#
-# Load before nm, vcached, and vservers, vserver-reference
-# chkconfig: 3 59 80
-# description: Fetch monitor ssh key to enable access to machine via monitor immediately.
-#
-# Stephen Soltesz <soltesz@cs.princeton.edu>
-# Copyright (C) 2008 The Trustees of Princeton University
-#
-# $Id$
-#
-
-case "$1" in
-    start|restart|reload)
-	;;
-    stop|status)
-	exit 0
-	;;
-    *)
-	echo $"Usage: $0 {start|stop|restart|status}"
-	exit 1
-	;;
-esac
-
-#
-# NOTE: This user is not used by monitor for the moment so better not create it.
-#
-
-# # NOTE: If user already exists, this just exists with status 9.  I think it's
-# # ok to simply let this command check and error out.
-# # Parse PLC configuration
-# if [ -r /etc/planetlab/plc_config ] ; then
-#     . /etc/planetlab/plc_config
-# else
-#     PLC_NAME="PlanetLab"
-#     PLC_SLICE_PREFIX="pl"
-#     PLC_BOOT_HOST="boot.planet-lab.org"
-# fi
-
-# USER="${PLC_SLICE_PREFIX}_monitor"
-# /usr/sbin/useradd -p "" -m $USER &> /dev/null || : 
-
-# if [ ! -d /home/$USER/.ssh ] ; then
-# 	mkdir /home/$USER/.ssh
-# 	chmod 700 /home/$USER/.ssh
-# 	chown $USER.$USER /home/$USER/.ssh
-# fi
-
-# URL="http://${PLC_BOOT_HOST}/PlanetLabConf/keys.php?$USER"
-# curl -s "$URL" > /home/$USER/.ssh/authorized_keys
-# chown $USER.$USER /home/$USER/.ssh/authorized_keys