make install: regenerate apache config

overwrites fossil-<hostname>.conf

1 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index def9421..5a3eaba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-systemctl_start_units = fossil-user.socket fossil-enable-apache@-.service
+systemctl_start_units = fossil-user.socket
 systemctl_user_start_units = fossil-httpd.socket
 
 ifneq (0,$(shell id -u))
@@ -56,7 +56,6 @@ SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
 default: install start follow
 install:
         install -t "$(bindir)" -- $(executables)
-        install -m644 -t /etc/apache2/sites-available -- src/fossil.conf~template
         install -t /etc/ssh/ -- src/AuthorizedKeysCommand
         install -T -- src/AnonymousForceCommand /etc/ssh/user-"$(SSH_USERNAME)".AnonymousForceCommand
         install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf
@@ -64,6 +63,9 @@ install:
         install -m644 -t "$(systemd_user_dir)" -- $(user_unit_files)
         systemctl daemon-reload
         systemctl reload ssh
+        systemctl start --wait fossil-disable-apache@-
+        install -m644 -t /etc/apache2/sites-available -- src/fossil.conf~template
+        systemctl start --wait fossil-enable-apache@-
         make start
 deps install-deps:
         apt install --mark-auto --no-upgrade $(dependencies)