From 5b54c3a0287a92008f1a795af45c43445a4daac9 Mon Sep 17 00:00:00 2001

From: Miklos Vajna <vmiklos@frugalware.org>

Date: Mon, 27 Dec 2010 17:14:27 +0100

Subject: [PATCH] systemd: install systemd unit files

bitlbee.service provides ForkDaemon mode,

bitlbee.socket/bitlbee@.service is available as well for the depreceated

inetd mode.

---

 Makefile                 |   20 +++++++++++++++++---

 configure                |   19 +++++++++++++++++++

 init/bitlbee.service.in  |    9 +++++++++

 init/bitlbee.socket      |    9 +++++++++

 init/bitlbee@.service.in |    8 ++++++++

 5 files changed, 62 insertions(+), 3 deletions(-)

 create mode 100644 init/bitlbee.service.in

 create mode 100644 init/bitlbee.socket

 create mode 100644 init/bitlbee@.service.in

diff --git a/Makefile b/Makefile

index 24ef216..9afd4e0 100644

--- a/Makefile

+++ b/Makefile

@@ -26,18 +26,18 @@ endif

 # Expansion of variables

 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)

-all: $(OUTFILE) $(OTR_PI)

+all: $(OUTFILE) $(OTR_PI) systemd

 	$(MAKE) -C doc

 uninstall: uninstall-bin uninstall-doc 

 	@echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'

-install: install-bin install-doc install-plugins

+install: install-bin install-doc install-plugins install-systemd

 	@if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi

 	@if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi

 	@echo

-.PHONY:   install   install-bin   install-etc   install-doc install-plugins \

+.PHONY:   install   install-bin   install-etc   install-doc install-plugins install-systemd \

         uninstall uninstall-bin uninstall-etc uninstall-doc \

         all clean distclean tar $(subdirs)

@@ -109,6 +109,20 @@ ifdef OTR_PI

 	install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)

 endif

+systemd:

+ifdef SYSTEMDSYSTEMUNITDIR

+	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service

+	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service

+endif

+

+install-systemd:

+ifdef SYSTEMDSYSTEMUNITDIR

+	mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)

+	install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)

+	install -m 0644 init/bitlbee@.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)

+	install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)

+endif

+

 tar:

 	fakeroot debian/rules clean || make distclean

 	x=$$(basename $$(pwd)); \

diff --git a/configure b/configure

index 3a3796d..8617d60 100755

--- a/configure

+++ b/configure

@@ -15,6 +15,7 @@ datadir='$prefix/share/bitlbee/'

 config='/var/lib/bitlbee/'

 plugindir='$prefix/lib/bitlbee/'

 includedir='$prefix/include/bitlbee/'

+systemdsystemunitdir=''

 libevent='/usr/'

 pidfile='/var/run/bitlbee.pid'

 ipcsocket='/var/run/bitlbee.sock'

@@ -62,6 +63,7 @@ Option		Description				Default

 --mandir=...						$mandir

 --datadir=...						$datadir

 --plugindir=...						$plugindir

+--systemdsystemunitdir=...				$systemdsystemunitdir

 --pidfile=...						$pidfile

 --config=...						$config

 --ipcsocket=...						$ipcsocket

@@ -487,6 +489,17 @@ else

 	fi;

 fi

+if [ -z "$systemdsystemunitdir" ]; then

+	if $PKG_CONFIG --exists systemd; then

+		systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd`

+	fi

+fi

+if [ -n "$systemdsystemunitdir" ]; then

+	if [ "$systemdsystemunitdir" != "no" ]; then

+		echo "SYSTEMDSYSTEMUNITDIR=$systemdsystemunitdir" >> Makefile.settings

+	fi

+fi

+

 if [ "$gcov" = "1" ]; then

 	echo "CFLAGS+=--coverage" >> Makefile.settings

 	echo "EFLAGS+=--coverage" >> Makefile.settings

@@ -740,6 +753,12 @@ else

 	echo '  Off-the-Record (OTR) Messaging disabled.'

 fi

+if [ -n "$systemdsystemunitdir" ]; then

+	echo '  systemd enabled.'

+else

+	echo '  systemd disabled.'

+fi

+

 echo '  Using event handler: '$events

 echo '  Using SSL library: '$ssl

 echo '  Building with these storage backends: '$STORAGES

diff --git a/init/bitlbee.service.in b/init/bitlbee.service.in

new file mode 100644

index 0000000..95cbe25

--- /dev/null

+++ b/init/bitlbee.service.in

@@ -0,0 +1,9 @@

+[Unit]

+Description=BitlBee IRC/IM gateway

+After=syslog.target

+

+[Service]

+ExecStart=@sbindir@/bitlbee -F -n

+

+[Install]

+WantedBy=multi-user.target

diff --git a/init/bitlbee.socket b/init/bitlbee.socket

new file mode 100644

index 0000000..e5ceb47

--- /dev/null

+++ b/init/bitlbee.socket

@@ -0,0 +1,9 @@

+[Unit]

+Conflicts=bitlbee.service

+

+[Socket]

+ListenStream=127.0.0.1:6667

+Accept=yes

+

+[Install]

+WantedBy=sockets.target

diff --git a/init/bitlbee@.service.in b/init/bitlbee@.service.in

new file mode 100644

index 0000000..8b576a4

--- /dev/null

+++ b/init/bitlbee@.service.in

@@ -0,0 +1,8 @@

+[Unit]

+Description=BitlBee Per-Connection Server

+After=syslog.target

+

+[Service]

+ExecStart=@sbindir@/bitlbee

+StandardInput=socket

+User=bitlbee

-- 

1.7.3.4