summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/rharchive.default5
-rw-r--r--debian/rharchive.init131
-rwxr-xr-xdebian/rules2
-rw-r--r--src/Makefile15
-rwxr-xr-xsrc/configure11
5 files changed, 4 insertions, 160 deletions
diff --git a/debian/rharchive.default b/debian/rharchive.default
deleted file mode 100644
index a2029ec..0000000
--- a/debian/rharchive.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defaults for rharchive initscript
-# sourced by /etc/init.d/rharchive
-
-# Additional options that are passed to the Daemon.
-DAEMONOPTS="--username rharchive"
diff --git a/debian/rharchive.init b/debian/rharchive.init
deleted file mode 100644
index fa07b6c..0000000
--- a/debian/rharchive.init
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: rharchive
-# Required-Start: $remote_fs $network $named $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Radio Helsinki Archive Daemon
-# Description: Enables Radio Helsinki Archive Daemon
-### END INIT INFO
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/rharchive
-CONFIG_DIR=/etc/rharchive
-NAME=rharchive
-DESC=rharchive
-VARRUN_DIR=/var/run/$NAME
-
-test -x $DAEMON || exit 0
-
-# Include rharchive defaults if available
-if [ -f /etc/default/rharchive ] ; then
- . /etc/default/rharchive
-fi
-
-start_inst () {
- STATUS="OK"
- if [ -f $CONFIG_DIR/$INSTNAME/config ] ; then
- CHROOTDIR=`grep '^chroot' < $CONFIG_DIR/$INSTNAME/config | sed 's/chroot\s*//'`
- if [ -n "$CHROOTDIR" ] ; then
- test -d $CHROOTDIR || mkdir -p $CHROOTDIR
- fi
- test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR
- DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$INSTNAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '`
- $DAEMON --write-pid $VARRUN_DIR/$INSTNAME.pid $DAEMONOPTS $DAEMONARG || STATUS="FAILED"
- else
- STATUS="no config found"
- fi
- echo -n "($STATUS)"
-}
-stop_inst () {
- kill `cat $PIDFILE` || true
- rm $PIDFILE
-}
-
-set -e
-case "$1" in
- start)
- echo -n "Starting $DESC:"
- if test -z "$2" ; then
- if [ -f $CONFIG_DIR/autostart ] ; then
- for INSTNAME in `sed 's/#.*//' < $CONFIG_DIR/autostart | grep -e '\w'`; do
- echo -n " $INSTNAME"
- start_inst
- done
- else
- echo " no config found"
- exit 1;
- fi
- else
- while shift ; do
- [ -z "$1" ] && break
- INSTNAME=$1
- echo -n " $INSTNAME"
- start_inst
- done
- fi
- echo "."
- ;;
- stop)
- echo -n "Stoping $DESC:"
- if test -z "$2" ; then
- for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
- INSTNAME=`basename $PIDFILE .pid`
- echo -n " $INSTNAME"
- stop_inst
- done
- else
- while shift ; do
- [ -z "$1" ] && break
- if test -e $VARRUN_DIR/$1.pid ; then
- PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
- INSTNAME=`basename $PIDFILE .pid`
- echo -n " $INSTNAME"
- stop_inst
- else
- echo -n " (failure: No such tunnel is running: $1)"
- fi
- done
- fi
- echo "."
- ;;
- reload)
- echo -n "Reloading $DESC:"
- if test -z "$2" ; then
- for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
- INSTNAME=`basename $PIDFILE .pid`
- echo -n " $INSTNAME"
- stop_inst
- start_inst
- done
- else
- while shift ; do
- [ -z "$1" ] && break
- if test -e $VARRUN_DIR/$1.pid ; then
- PIDFILE=`ls $VARRUN_DIR/$1.pid 2> /dev/null`
- INSTNAME=`basename $PIDFILE .pid`
- echo -n " $INSTNAME"
- stop_inst
- start_inst
- else
- echo -n " (failure: No such tunnel is running: $1)"
- fi
- done
- fi
- echo "."
- ;;
- restart|force-reload)
- SCRIPT=$0
- shift
- $SCRIPT stop $*
- sleep 1
- $SCRIPT start $*
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 3999dc3..b1b7fda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- cd src && ./configure --no-manpage --prefix=/usr --sysconfdir=/etc && cd ..
+ cd src && ./configure --no-manpage --prefix=/usr && cd ..
touch configure-stamp
build: build-stamp
diff --git a/src/Makefile b/src/Makefile
index 0e989ac..a2f101a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -40,7 +40,7 @@ C_OBJS := log.o \
C_SRCS := $(C_OBJS:%.o=%.c)
-.PHONY: clean cleanall distclean manpage install install-bin install-etc install-man uninstall remove purge
+.PHONY: clean cleanall distclean manpage install install-bin install-man uninstall remove
all: $(EXECUTABLE)
@@ -94,8 +94,8 @@ manpage:
$(MAKE) --directory="../doc/" manpage
-INSTALL_TARGETS := install-bin install-etc
-REMOVE_TARGETS := remove-bin remove-etc
+INSTALL_TARGETS := install-bin
+REMOVE_TARGETS := remove-bin
ifdef MANDIR
INSTALL_TARGETS += install-man
@@ -108,9 +108,6 @@ install-bin: $(EXECUTABLE)
$(INSTALL) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR)
-install-etc:
- $(INSTALL) -d $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)/
-
install-man: manpage
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8/
$(INSTALL) -m 644 ../doc/$(EXECUTABLE).8 $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8
@@ -122,11 +119,5 @@ remove: $(REMOVE_TARGETS)
remove-bin:
rm -f $(DESTDIR)$(BINDIR)/$(EXECUTABLE)
-remove-etc:
- rm -f $(DESTDIR)$(ETCDIR)/init.d/$(EXECUTABLE)
-
remove-man:
rm -f $(DESTDIR)$(MANDIR)/man8/$(EXECUTABLE).8
-
-purge: remove
- rm -rf $(DESTDIR)$(ETCDIR)/$(EXECUTABLE)
diff --git a/src/configure b/src/configure
index 56a0112..9de0fca 100755
--- a/src/configure
+++ b/src/configure
@@ -33,7 +33,6 @@ LDFLAGS='-g -Wall -O2'
PREFIX='/usr/local'
BINDIR=''
-ETCDIR=''
MANDIR=''
INSTALLMANPAGE=1
@@ -42,7 +41,6 @@ print_usage() {
echo " --target=<TARGET> build target i.e. Linux (default: autodetect)"
echo " --prefix=<PREFIX> the installation prefix (default: /usr/local)"
echo " --bindir=<DIR> the path to the bin directory (default: $PREFIX/bin)"
- echo " --sysconfdir=<DIR> the path to the system configuration directory (default: $PREFIX/etc"
echo " --mandir=<DIR> the path to the system man pages (default: $PREFIX/share/man)"
echo " --no-manpage dont't install manpage"
}
@@ -59,9 +57,6 @@ do
--bindir=*)
BINDIR=${arg#--bindir=}
;;
- --sysconfdir=*)
- ETCDIR=${arg#--sysconfdir=}
- ;;
--mandir=*)
MANDIR=${arg#--mandir=}
;;
@@ -112,10 +107,6 @@ if [ -z "$BINDIR" ]; then
BINDIR=$PREFIX/bin
fi
-if [ -z "$ETCDIR" ]; then
- ETCDIR=$PREFIX/etc
-fi
-
if [ -z "$MANDIR" ]; then
MANDIR=$PREFIX/share/man
fi
@@ -135,7 +126,6 @@ RAGEL := ragel
PREFIX := '$PREFIX'
BINDIR := '$BINDIR'
-ETCDIR := '$ETCDIR'
EOF
if [ $INSTALLMANPAGE -eq 1 ]; then
@@ -174,7 +164,6 @@ cat > config.h <<EOF
#define TARGET "$TARGET"
#define PREFIX "$PREFIX"
#define BINDIR "$BINDIR"
-#define ETCDIR "$ETCDIR"
#endif
EOF