Changeset 8ca172f

Timestamp:

2022-12-04T17:09:00Z (2 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

2bd8f39

Parents:

7e90c03

git-author:

Björn Bidar <bjorn.bidar@…> (04-12-22 17:09:00)

git-committer:

GitHub <noreply@…> (04-12-22 17:09:00)

Message:

Systemd Enhancements: Create user and directory automatically (#163)

• configure: Simplify check for systemd, allow to request systemd support

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• configure: Add helper to be compatible with old and new systemd pc vars

Re:
​https://github.com/systemd/systemd/commit/4908de44b0a0409f84a7cdc5641b114d6ce8ba03

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• systemd: Support systemd-sysusers.d

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• systemd: Define StateDirectory, create biltbee directory automatically

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• systemd: Also listen to /run/bitlbee/socket

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• systemd: Create RuntimeDirectory automatically

Signed-off-by: Björn Bidar <bjorn.bidar@…>

• systemd: Also run regular systemd service as user

Signed-off-by: Björn Bidar <bjorn.bidar@…>

Signed-off-by: Björn Bidar <bjorn.bidar@…>

Files:

• Makefile (modified) (2 diffs)
• configure (modified) (6 diffs)
• init/bitlbee.service.in (modified) (1 diff)
• init/bitlbee.socket (modified) (1 diff)
• init/bitlbee.sysusers (added)
• init/bitlbee@.service.in (modified) (1 diff)

Makefile

@@ -33 +33 @@
         @echo Installed successfully
         @echo
+ifndef SYSTEMDSYSTEMUNITDIR
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
+endif
         @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
 ifdef SYSTEMDSYSTEMUNITDIR
@@ -144 +146 @@
 endif
 
+ifdef SYSUSERSDIR
+        $(INSTALL) -Dm644 init/bitlbee.sysusers $(DESTDIR)/$(SYSUSERSDIR)/bitlbee.conf
+else
+        @echo SYSUSERSDIR not set, not install sysusers.d files
+endif
+
 tar:
         fakeroot debian/rules clean || make distclean

configure

@@ -19 +19 @@
 includedir='$prefix/include/bitlbee/'
 systemdsystemunitdir=''
+sysusersdir=''
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
@@ -55 +56 @@
 
 pie=1
+
+systemd=auto
 
 arch=$(uname -s)
@@ -129 +132 @@
 --plugindir=...                                         $plugindir
 --systemdsystemunitdir=...                              $systemdsystemunitdir
+--sysusersdir                       $sysusersdir
 --pidfile=...                                           $pidfile
 --config=...                                            $config
@@ -157 +161 @@
                                                         $ssl
 --external_json_parser=0/1/auto Use External JSON parser $external_json_parser
+--systemd=0/1  Enable/disable systemd support $systemd
 
 
@@ -750 +755 @@
 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
+if [ ! "$systemd" = 0 ]; then
+    if ! $PKG_CONFIG --exists systemd ; then
+        if [ -n "$systemdsystemunitdir" ] || [ "$systemd" -eq 1 ]; then
+            echo "systemd requested but not found"
+            exit 1
+        else
+            systemd=0
+        fi
+    fi
+fi
+
+pkgconf_systemd_var() {
+    # First try deprecated variable, use newer variable if not found
+    if $PKG_CONFIG --print-variables systemd | grep -q $1 ; then
+        $PKG_CONFIG --variable=$1 systemd
+    else
+        $PKG_CONFIG --variable=$2 systemd
+    fi
+}
+
+if [ "$systemd" -eq 1 ]; then
+        if [ -z "$systemdsystemunitdir" ]; then
+                systemdsystemunitdir=$(pkgconf_systemd_var systemdsystemunitdir systemd_system_unit_dir)
+        fi
+    if [ -z "$tmpfiles_dir" ] ; then
+        tmpfilesdir=$(pkgconf_systemd_var tmpfilesdir tmpfiles_dir)
+    fi
+    if [ -z "$sysusersdir" ] ; then
+        sysusersdir=$(pkgconf_systemd_var sysusersdir sysusers_dir)
+    fi
+
+        echo "SYSTEMDSYSTEMUNITDIR=$systemdsystemunitdir" >> Makefile.settings
+    echo "SYSUSERSDIR=$sysusersdir" >> Makefile.settings
 fi
 
@@ -1005 +1034 @@
 fi
 
-if [ -n "$systemdsystemunitdir" ]; then
+if [ "$systemd" -eq 1 ]; then
         echo '  systemd enabled.'
 else

init/bitlbee.service.in

@@ -5 +5 @@
 ExecStart=@sbindir@bitlbee -F -n
 KillMode=process
+StateDirectory=bitlbee
+RuntimeDirectory=bitlbee
+User=bitlbee
 
 [Install]

init/bitlbee.socket

@@ -4 +4 @@
 [Socket]
 ListenStream=6667
+ListenStream=%t/bitlbee/socket
 BindToDevice=lo
 Accept=yes

init/bitlbee@.service.in

@@ -7 +7 @@
 StandardError=syslog
 User=bitlbee
+StateDirectory=bitlbee
+RuntimeDirectory=bitlbee