* Remove some obsolete stuff.

svn path=/nixpkgs/trunk/; revision=11689

12 files changed, 0 insertions, 499 deletions

diff --git a/pkgs/servers/network-script/builder.sh b/pkgs/servers/network-script/builder.sh
deleted file mode 100644
index 466644fe486d..000000000000
--- a/pkgs/servers/network-script/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-sed -e "s^@bash\@^$bash^g" \
-    -e "s^@dhcp\@^$dhcp^g" \
-    -e "s^@initscripts\@^$initscripts^g" \
-    -e "s^@nettools\@^$nettools^g" \
-    < $script > $out/control
-
-chmod +x $out/control
diff --git a/pkgs/servers/network-script/default.nix b/pkgs/servers/network-script/default.nix
deleted file mode 100644
index fa85bd3b2203..000000000000
--- a/pkgs/servers/network-script/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, bash, nettools, dhcp, key ? null, initscripts}:
-
-stdenv.mkDerivation {
-  name = "network-script-0.0.1";
-  server = "network";
-  nicename = "networking";
-  builder = ./builder.sh ;
-  inherit bash nettools dhcp initscripts;
-  script = [./network];
-}
diff --git a/pkgs/servers/network-script/network b/pkgs/servers/network-script/network
deleted file mode 100755
index e676ff55a04c..000000000000
--- a/pkgs/servers/network-script/network
+++ /dev/null
@@ -1,66 +0,0 @@
-#!@bash@/bin/bash
-#
-# Dummy init file for network, hacketyhack!
-#
-# chkconfig: 2345 55 25
-# description: OpenSSH server daemon
-#
-# processname: sshd
-
-# source function library
-source @initscripts@/functions
-
-# pull in sysconfig settings
-#[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
-
-RETVAL=0
-prog="network"
-INTERFACE=eth0
-
-startService()
-{
-	# just do networking
-	echo -n "Starting $prog:"
-	@dhcp@/sbin/dhclient $INTERFACE
-
-	RETVAL=$?
-	echo "retval $RETVAL"
-	return $RETVAL
-}
-
-stopService()
-{
-	echo "BLAAT"
-}
-
-reload()
-{
-	start
-	stop
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	reload)
-		reload
-		;;
-	status)
-		status
-		;;
-	name)
-		name
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|reload|status|name}"
-		RETVAL=1
-esac
-exit $RETVAL
diff --git a/pkgs/servers/server-scripts/generic/builder.sh b/pkgs/servers/server-scripts/generic/builder.sh
deleted file mode 100644
index 7eae08df6249..000000000000
--- a/pkgs/servers/server-scripts/generic/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-sed -e "s^@bash\@^$bash^g" \
-    -e "s^@sshd\@^$ssh^g" \
-    -e "s^@initscripts\@^$initscripts^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@nixpkgs\@^$nixpkgs^g" \
-    -e "s^@nix\@^$nix^g" \
-    < $functions > $out/$nicename
diff --git a/pkgs/servers/server-scripts/generic/default.nix b/pkgs/servers/server-scripts/generic/default.nix
deleted file mode 100644
index 4e9022568b4a..000000000000
--- a/pkgs/servers/server-scripts/generic/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, bash, nix}:
-
-stdenv.mkDerivation {
-  name = "generic-server-script-0.0.1";
-  server = "generic";
-  nicename = "functions";
-  builder = ./builder.sh ;
-  functions = [./functions];
-  nixpkgs = "/nixpkgs/trunk/pkgs";
-  inherit bash nix;
-}
diff --git a/pkgs/servers/server-scripts/generic/functions b/pkgs/servers/server-scripts/generic/functions
deleted file mode 100644
index d67370388f03..000000000000
--- a/pkgs/servers/server-scripts/generic/functions
+++ /dev/null
@@ -1,117 +0,0 @@
-#! @bash@/bin/sh -e
-
-## Generic service scripts for NixOS, which provide
-## * functions to write state to files (/var/run/nix-services)
-## * functions to read state from file (/var/run/nix-services)
-## * sanity checking functions
-
-STATEDIR=/var/run/nix-services
-RCDIR=/etc/rc.d/
-NIXPKGS=@nixpkgs@
-
-## resolve $deps to real start/stop scripts first
-
-start_deps() {
-	for i in $deps; do
-		echo $i
-		name=`$i/control name`
-
-		if ! test -a "$RCDIR/$name"; then
-			echo $RCDIR/$name $i
-			@nix@/bin/nix-env -p $RCDIR/$name -i $i
-		fi
-
-		$i/control start
-
-		RETVAL=$?
-		if test $RETVAL != 0; then
-			exit $RETVAL	
-		fi
-	done
-}
-
-start_softdeps() {
-	for i in $softdeps; do
-		echo $i
-
-		name=`$i/control name`
-		if ! test -a "$RCDIR/$name"; then
-			echo $RCDIR/$name $i
-			@nix@/bin/nix-env -p $RCDIR/$name -i $i
-		fi
-
-		$i/control start
-
-		RETVAL=$?
-		if test $RETVAL != 0; then
-			continue
-		fi
-	done
-}
-
-start() {
-	# are we already running?
-	# if so, exit with code 0
-	if test -a $STATEDIR/$prog; then
-		exit 0
-	fi
-	# if not, continue
-	# launch all hard dependencies
-	start_deps
-
-	RETVAL=$?
-
-	if test $RETVAL != 0; then
-		echo $prog failed
-		exit $RETVAL
-	fi
-
-	# launch all preferred dependencies
-	echo "softdeps" $softdeps
-	start_softdeps
-	# launch our own program
-	startService
-	# if successful, then register
-
-	RETVAL=$?
-
-	if test $RETVAL != 0; then
-		echo $prog failed
-		exit $RETVAL
-	fi
-
-	register
-}
-
-stop() {
-	echo "stopping $prog"
-	# are we running? If so, then stop, otherwise, do nothing...
-	if ! test -a $STATEDIR/$prog; then
-		exit 0
-	fi
-	# stop our own program
-	stopService
-	echo "unregistering"
-	unregister
-}
-
-register() {
-	touch $STATEDIR/$prog
-}
-
-unregister() {
-	rm $STATEDIR/$prog
-}
-
-status() {
-	# are we running? If so, report
-	if test -a $STATEDIR/$prog; then
-		echo "running"
-	else
-		echo "stopped"
-	fi
-}
-
-name() {
-	echo $prog
-}
diff --git a/pkgs/servers/ssh-script/builder.sh b/pkgs/servers/ssh-script/builder.sh
deleted file mode 100644
index 031438d5492e..000000000000
--- a/pkgs/servers/ssh-script/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-sed -e "s^@bash\@^$bash^g" \
-    -e "s^@sshd\@^$ssh^g" \
-    -e "s^@initscripts\@^$initscripts^g" \
-    -e "s^@coreutils\@^$coreutils^g" \
-    -e "s^@softdeps\@^$softdeps^g" \
-    -e "s^@deps\@^$deps^g" \
-    < $script > $out/control
-
-chmod +x $out/control
diff --git a/pkgs/servers/ssh-script/default.nix b/pkgs/servers/ssh-script/default.nix
deleted file mode 100644
index 03897e26b35c..000000000000
--- a/pkgs/servers/ssh-script/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, ssh, bash, initscripts, coreutils, key ? null, syslog ? null, networking}:
-
-stdenv.mkDerivation {
-  name = "ssh-script-0.0.1";
-  nicename = "sshd";
-  server = "ssh";
-  builder = ./builder.sh ;
-  softdeps = [syslog];
-  deps = [networking];
-  inherit bash ssh initscripts coreutils;
-  script = [./sshd];
-}
diff --git a/pkgs/servers/ssh-script/sshd b/pkgs/servers/ssh-script/sshd
deleted file mode 100755
index ccce294e10cf..000000000000
--- a/pkgs/servers/ssh-script/sshd
+++ /dev/null
@@ -1,163 +0,0 @@
-#!@bash@/bin/bash
-#
-# Init file for OpenSSH server daemon
-#
-# chkconfig: 2345 55 25
-# description: OpenSSH server daemon
-#
-# processname: sshd
-# config: /etc/ssh/ssh_host_key
-# config: /etc/ssh/ssh_host_key.pub
-# config: /etc/ssh/ssh_random_seed
-# config: /etc/ssh/sshd_config
-# pidfile: /var/run/sshd.pid
-
-# source function library
-source @initscripts@/functions
-
-# pull in sysconfig settings
-[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
-
-RETVAL=0
-prog="sshd"
-
-softdeps="@softdeps@"
-deps="@deps@"
-
-# Some functions to make the below more readable
-KEYGEN=@sshd@/bin/ssh-keygen
-SSHD=@sshd@/sbin/sshd
-RSA1_KEY=/etc/ssh/ssh_host_key
-RSA_KEY=/etc/ssh/ssh_host_rsa_key
-DSA_KEY=/etc/ssh/ssh_host_dsa_key
-PID_FILE=/var/run/sshd.pid
-OPTIONS="-h $DSA_KEY -h RSA_KEY -h RSA1_KEY"
-
-do_rsa1_keygen() {
-	if [ ! -s $RSA1_KEY ]; then
-		echo -n $"Generating SSH1 RSA host key: "
-		if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
-			@coreutils@/bin/chmod 600 $RSA1_KEY
-			@coreutils@/bin/chmod 644 $RSA1_KEY.pub
-			success $"RSA1 key generation"
-			echo
-		else
-			failure $"RSA1 key generation"
-			echo
-			exit 1
-		fi
-	fi
-}
-
-do_rsa_keygen() {
-	if [ ! -s $RSA_KEY ]; then
-		echo -n $"Generating SSH2 RSA host key: "
-		if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
-			@coreutils@/bin/chmod 600 $RSA_KEY
-			@coreutils@/bin/chmod 644 $RSA_KEY.pub
-			success $"RSA key generation"
-			echo
-		else
-			failure $"RSA key generation"
-			echo
-			exit 1
-		fi
-	fi
-}
-
-do_dsa_keygen() {
-	if [ ! -s $DSA_KEY ]; then
-		echo -n $"Generating SSH2 DSA host key: "
-		if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
-			@coreutils@/bin/chmod 600 $DSA_KEY
-			@coreutils@/bin/chmod 644 $DSA_KEY.pub
-			success $"DSA key generation"
-			echo
-		else
-			failure $"DSA key generation"
-			echo
-			exit 1
-		fi
-	fi
-}
-
-do_restart_sanity_check()
-{
-	$SSHD -t
-	RETVAL=$?
-	if [ ! "$RETVAL" = 0 ]; then
-		failure $"Configuration file or keys are invalid"
-		echo
-	fi
-}
-
-startService()
-{
-	# Create keys if necessary
-	do_rsa1_keygen
-	do_rsa_keygen
-	do_dsa_keygen
-
-	echo -n $"Starting $prog:"
-	#@initscripts@/sbin/initlog -c "$SSHD $OPTIONS" && success || failure
-	$SSHD $OPTIONS
-	RETVAL=$?
-	[ "$RETVAL" = 0 ] && @coreutils@/bin/touch /var/lock/subsys/sshd
-	echo
-}
-
-stopService()
-{
-	echo -n $"Stopping $prog:"
-	#killproc $SSHD -TERM
-	@coreutils@/bin/kill `@coreutils@/bin/cat /var/run/sshd.pid`
-	RETVAL=$?
-	[ "$RETVAL" = 0 ] && @coreutils@/bin/rm -f /var/lock/subsys/sshd
-	echo
-}
-
-reload()
-{
-	echo -n $"Reloading $prog:"
-	killproc $SSHD -HUP
-	RETVAL=$?
-	echo
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	reload)
-		reload
-		;;
-	condrestart)
-		if [ -f /var/lock/subsys/sshd ] ; then
-			do_restart_sanity_check
-			if [ "$RETVAL" = 0 ] ; then
-				stop
-				# avoid race
-				sleep 3
-				start
-			fi
-		fi
-		;;
-	status)
-		status $SSHD
-		RETVAL=$?
-		;;
-	name)
-		name
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
-		RETVAL=1
-esac
-exit $RETVAL
diff --git a/pkgs/servers/syslog-script/builder.sh b/pkgs/servers/syslog-script/builder.sh
deleted file mode 100644
index 9c6cf385c242..000000000000
--- a/pkgs/servers/syslog-script/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-
-sed -e "s^@bash\@^$bash^g" \
-    -e "s^@syslog\@^$syslog^g" \
-    -e "s^@nicename\@^$nicename^g" \
-    -e "s^@initscripts\@^$initscripts^g" \
-    < $script > $out/control
-
-chmod +x $out/control
diff --git a/pkgs/servers/syslog-script/default.nix b/pkgs/servers/syslog-script/default.nix
deleted file mode 100644
index c98da1e49efc..000000000000
--- a/pkgs/servers/syslog-script/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, bash, syslog, initscripts}:
-
-stdenv.mkDerivation {
-  name = "syslog-script-0.0.1";
-  server = "syslog";
-  nicename = "syslog";
-  builder = ./builder.sh ;
-  inherit bash syslog initscripts;
-  script = [./syslog];
-}
diff --git a/pkgs/servers/syslog-script/syslog b/pkgs/servers/syslog-script/syslog
deleted file mode 100755
index 9a82f5eaf03a..000000000000
--- a/pkgs/servers/syslog-script/syslog
+++ /dev/null
@@ -1,64 +0,0 @@
-#!@bash@/bin/bash
-#
-# Dummy init file for syslog, hacketyhack!
-#
-# chkconfig: 2345 55 25
-# description: OpenSSH server daemon
-#
-# processname: sshd
-
-# source function library
-source @initscripts@/functions
-
-# pull in sysconfig settings
-#[ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
-
-RETVAL=0
-prog=@nicename@
-
-startService()
-{
-	# just do networking
-	echo -n "Starting $prog:"
-	@syslog@/usr/sbin/syslogd
-	@syslog@/usr/sbin/klogd
-}
-
-stopService()
-{
-	echo -n "Stopping $prog:"
-	kill `cat /var/run/syslogd.pid`
-	kill `cat /var/run/klogd.pid`
-}
-
-reloadService()
-{
-	stop
-	start
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	reload)
-		reload
-		;;
-	status)
-		status
-		;;
-	name)
-		name
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart|reload|status}"
-		RETVAL=1
-esac
-exit $RETVAL