From 8f6dc80716279c017c01c8f98171fe5159411521 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 1 Jun 2023 18:24:57 -0400 Subject: make install: regenerate apache config overwrites fossil-.conf --- Makefile | 6 ++++-- 1 file 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) -- cgit v1.2.3