diff options
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | systemctl_start_units = fossil-user.socket fossil-enable-apache@-.service | 1 | systemctl_start_units = fossil-user.socket |
2 | systemctl_user_start_units = fossil-httpd.socket | 2 | systemctl_user_start_units = fossil-httpd.socket |
3 | 3 | ||
4 | ifneq (0,$(shell id -u)) | 4 | ifneq (0,$(shell id -u)) |
@@ -56,7 +56,6 @@ SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi | |||
56 | default: install start follow | 56 | default: install start follow |
57 | install: | 57 | install: |
58 | install -t "$(bindir)" -- $(executables) | 58 | install -t "$(bindir)" -- $(executables) |
59 | install -m644 -t /etc/apache2/sites-available -- src/fossil.conf~template | ||
60 | install -t /etc/ssh/ -- src/AuthorizedKeysCommand | 59 | install -t /etc/ssh/ -- src/AuthorizedKeysCommand |
61 | install -T -- src/AnonymousForceCommand /etc/ssh/user-"$(SSH_USERNAME)".AnonymousForceCommand | 60 | install -T -- src/AnonymousForceCommand /etc/ssh/user-"$(SSH_USERNAME)".AnonymousForceCommand |
62 | install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf | 61 | install -m644 -t /etc/ssh/sshd_config.d -- src/fossil-user.conf |
@@ -64,6 +63,9 @@ install: | |||
64 | install -m644 -t "$(systemd_user_dir)" -- $(user_unit_files) | 63 | install -m644 -t "$(systemd_user_dir)" -- $(user_unit_files) |
65 | systemctl daemon-reload | 64 | systemctl daemon-reload |
66 | systemctl reload ssh | 65 | systemctl reload ssh |
66 | systemctl start --wait fossil-disable-apache@- | ||
67 | install -m644 -t /etc/apache2/sites-available -- src/fossil.conf~template | ||
68 | systemctl start --wait fossil-enable-apache@- | ||
67 | make start | 69 | make start |
68 | deps install-deps: | 70 | deps install-deps: |
69 | apt install --mark-auto --no-upgrade $(dependencies) | 71 | apt install --mark-auto --no-upgrade $(dependencies) |