begin to implement user service

4 files changed, 62 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index e8c4a45..12b9329 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
+ifneq (0,$(shell id -u))
 fossil_database = db
+unitdir = "$${XDG_CONFIG_HOME:-$$HOME/.config}/systemd/user"
 unit_instance_name != systemd-escape "$$(realpath "$(fossil_database)")"
 our_name = fossil-sync
 unit_files_basenames = $(addprefix $(our_name)@.,service path timer)
@@ -8,7 +10,9 @@ unit_instance = $(our_name)@$(unit_instance_name).service
 
 default: install start ui
 install:
-        systemctl --user link $(addprefix ./, $(unit_files))
+        install -m644 -t $(unitdir) -- $(unit_files)
+        systemctl --user daemon-reload
+        sudo make $@
 start stop restart status show: | $(fossil_database)
         systemctl --user $@ $(unit_instances)
 follow:
@@ -29,3 +33,20 @@ work:
         mkdir -p $@
 work/.fslckout: | work $(fossil_database)
         cd work && fossil open ../$(fossil_database)
+else
+unitdir = /etc/systemd/system
+unit_files = $(addprefix src/fossil-user,@.service .socket)
+units = $(filter-out %@.service,$(notdir $(unit_files)))
+executables = src/endofossil
+bindir = /usr/local/bin
+
+default: install start follow
+install:
+        install -m644 -t $(unitdir) -- $(unit_files)
+        install -t $(bindir) -- $(executables)
+        systemctl daemon-reload
+start stop restart status show:
+        systemctl $@ $(units)
+follow:
+        journalctl $(addprefix -u , $(units)) -f
+endif
diff --git a/src/endofossil b/src/endofossil
new file mode 100644
index 0000000..401806f
--- /dev/null
+++ b/src/endofossil
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -e
+
+
+IFS=/ read n pid uid <<< "$1"
+[ "$pid" ]
+
+authtype=
+while read -d ''
+do
+    case "${REPLY%%=*}" in
+        'SSH_USER_AUTH' ) read authtype keytype keyvalue < "${REPLY#*=}" ;;
+    esac
+done < /proc/$pid/environ
+[ "$authtype" = publickey ]
+
+keyhash=
+while read
+do
+    set -- $REPLY
+    if [ "$3 $5" = 'SSHFP 2' ]
+    then
+        keyhash=$6
+        break
+    fi
+done < <(ssh-keygen -f <(printf '%s\n' "$keytype $keyvalue") -r .)
+[ "$keyhash" ]
+
+printf '%s\n' "$keyhash"
diff --git a/src/fossil-user.socket b/src/fossil-user.socket
new file mode 100644
index 0000000..eab5a51
--- /dev/null
+++ b/src/fossil-user.socket
@@ -0,0 +1,5 @@
+[Socket]
+Accept = yes
+ListenStream = /run/fossil-user.S
+SocketUser = d
+SocketMode = 0600
diff --git a/src/fossil-user@.service b/src/fossil-user@.service
new file mode 100644
index 0000000..1b70358
--- /dev/null
+++ b/src/fossil-user@.service
@@ -0,0 +1,6 @@
+[Unit]
+Description = Fossil server process
+
+[Service]
+StandardInput=socket
+ExecStart = endofossil '%I'