simplify and improve Makefile

clean separation of user units and system units for systemd

all user units files now installed into /etc/systemd/user

the source files have been moved so that the source directory structure
indicates whether the unit is for system or user activation.

7 files changed, 31 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index e152f88..da5a2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,20 @@
+systemctl_start_units = fossil-user.socket
+systemctl_user_start_units = fossil-httpd.socket
+
 ifneq (0,$(shell id -u))
 fossil_database = db.fossil
-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)
-unit_files = $(addprefix src/,$(unit_files_basenames) fossil-init@.service $(addprefix fossil-httpd,.socket @.service))
-unit_instances = $(subst @,@"$(unit_instance_name)",$(unit_files_basenames))
-unit_instance = $(our_name)@$(unit_instance_name).service
-fossil_test_instances = '$(shell systemd-escape fossil-test-instance-1)' '$(shell systemd-escape a/b/c/fossil-test-instance-2)'
+fossil_instance_name != systemd-escape "$$(realpath $(fossil_database))"
+
+systemctl_user_start_units += $(addprefix fossil-sync@$(fossil_instance_name).,service timer path)
 
 default: install start test
 install:
-        sudo make install-deps
-        install -m644 -t $(unitdir) -- $(unit_files)
+        sudo make install-deps install
         systemctl --user daemon-reload
-        systemctl --user start fossil-httpd.socket
-        sudo make $@
 start stop restart status show: | $(fossil_database)
-        systemctl --user $@ $(unit_instances)
+        systemctl --user $@ $(systemctl_user_start_units)
 follow:
-        journalctl --user $(addprefix -u , $(unit_instances)) -f
-test:
-        mkdir -p $(HOME)/src/a/b/c
-        systemctl --user start --wait $(addprefix fossil-init@,$(fossil_test_instances))
-        sudo $(MAKE) -$(MAKEFLAGS) $@
+        journalctl --user $(addprefix -u , $(systemctl_user_start_units)) -f
 
 
 
@@ -34,6 +25,16 @@ ui: | work/.fslckout
 
 
 
+
+fossil_test_instances = \
+'$(shell systemd-escape fossil-test-instance-1)' \
+'$(shell systemd-escape a/b/c/fossil-test-instance-2)'
+
+test:
+        mkdir -p $(HOME)/src/a/b/c
+        systemctl --user start --wait $(addprefix fossil-init@,$(fossil_test_instances))
+        sudo $(MAKE) -$(MAKEFLAGS) $@
+
 $(fossil_database):
         fossil init $@
 work:
@@ -41,9 +42,11 @@ work:
 work/.fslckout: | work $(fossil_database)
         cd work && fossil open ../$(fossil_database)
 else
-unitdir = /etc/systemd/system
-unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.service src/fossil-init@.service
-units = $(filter-out %@.service,$(notdir $(unit_files)))
+user_unit_files = $(wildcard $(addprefix src/user/*.,timer service path socket))
+root_unit_files = $(wildcard $(addprefix src/*.,timer service path socket))
+systemd_system_dir=/etc/systemd/system
+systemd_user_dir=/etc/systemd/user
+
 executables = src/endofossil
 bindir = /usr/local/bin
 dependencies = socat fossil ssh openssh-server fakeroot
@@ -52,20 +55,21 @@ SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
 
 default: install start follow
 install:
+        install -t "$(bindir)" -- $(executables)
         install -t /etc/ssh/ -- src/AuthorizedKeysCommand
-        install -T -- src/AnonymousForceCommand /etc/ssh/user-$(SSH_USERNAME).AnonymousForceCommand
+        install -T -- src/AnonymousForceCommand /etc/ssh/user-"$(SSH_USERNAME)".AnonymousForceCommand
         install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf
-        install -m644 -t $(unitdir) -- $(unit_files)
-        install -t $(bindir) -- $(executables)
+        install -m644 -t "$(systemd_system_dir)" -- $(root_unit_files)
+        install -m644 -t "$(systemd_user_dir)" -- $(user_unit_files)
         systemctl daemon-reload
         systemctl reload ssh
-        systemctl start fossil-user.socket
+        make start
 deps install-deps:
         apt install --mark-auto --no-upgrade $(dependencies)
 test: install
         journalctl -f -u fossil-test@$(SSH_USERNAME) & p=$$!; systemctl start --wait fossil-test@$(SSH_USERNAME); sleep 1; kill $$p
 start stop restart status show:
-        systemctl $@ $(units)
+        systemctl $@ $(systemctl_start_units)
 follow:
-        journalctl $(addprefix -u , $(units)) -f
+        journalctl $(addprefix -u , $(systemctl_start_units)) -f
 endif
diff --git a/src/fossil-httpd.socket b/src/user/fossil-httpd.socket
index 3575752..3575752 100644
--- a/src/fossil-httpd.socket
+++ b/src/user/fossil-httpd.socket
diff --git a/src/fossil-httpd@.service b/src/user/fossil-httpd@.service
index eccc17c..eccc17c 100644
--- a/src/fossil-httpd@.service
+++ b/src/user/fossil-httpd@.service
diff --git a/src/fossil-init@.service b/src/user/fossil-init@.service
index 6e300b0..6e300b0 100644
--- a/src/fossil-init@.service
+++ b/src/user/fossil-init@.service
diff --git a/src/fossil-sync@.path b/src/user/fossil-sync@.path
index cb34a02..cb34a02 100644
--- a/src/fossil-sync@.path
+++ b/src/user/fossil-sync@.path
diff --git a/src/fossil-sync@.service b/src/user/fossil-sync@.service
index 05f71cb..05f71cb 100644
--- a/src/fossil-sync@.service
+++ b/src/user/fossil-sync@.service
diff --git a/src/fossil-sync@.timer b/src/user/fossil-sync@.timer
index 4611f40..4611f40 100644
--- a/src/fossil-sync@.timer
+++ b/src/user/fossil-sync@.timer