1 files changed, 24 insertions, 9 deletions

diff --git a/EndoForge/Makefile b/EndoForge/Makefile
index 46f1af4..3846ebd 100644
--- a/EndoForge/Makefile
+++ b/EndoForge/Makefile
@@ -1,13 +1,18 @@
+ENDOFORGE_BACKUPS = y
+ifneq (,$(ENDOFORGE_BACKUPS))
+INSTALL := install -b --suffix=~$(shell date -Ins | tr -d :)
+else
+INSTALL = install
+endif
+
 ifeq ($(shell id -u),0)
 SUDO =
 else
 SUDO = sudo
 endif
 
-ROOT_INSTALL = $(SUDO) install
-
+ROOT_INSTALL = $(SUDO) $(INSTALL)
 USER != echo "$${SUDO_USER:-$$(id -un)}"
-
 SSH_CONFIG_DIR = /etc/ssh
 SSHD_CONFIG_DIR = $(SSH_CONFIG_DIR)/sshd_config.d
 SSH_LIB_DIR = /usr/lib/ssh
@@ -15,7 +20,7 @@ USER_SSH_CONFIG_DIR = ~$(USER)/.ssh
 
 BROWSER != 2>/dev/null which xdg-open || which w3m || which links || which elinks
 
-.PHONY: install shared doc test
+.PHONY: install install-user install-root shared doc test
 
 doc: README.html
         $(BROWSER) $<
@@ -24,17 +29,27 @@ shared: install
         git config core.self-forge true
 
 SRC = src
-SOURCES = $(addprefix $(SRC), AnonymousAccessCommand anonymous-access.conf AuthorizedKeysCommand)
+SOURCE_NAMES = AnonymousAccessCommand anonymous-access.conf AuthorizedKeysCommand sshd_config
+SOURCES = $(addprefix $(SRC), $(SOURCE_NAMES))
+
+install: install-user install-root
 
-install:
-        install -t $(USER_SSH_CONFIG_DIR) $(SRC)/AnonymousAccessCommand
-        $(ROOT_INSTALL) -d "$(SSH_CONFIG_DIR)" "$(SSHD_CONFIG_DIR)" "$(SSH_LIB_DIR)" || true
+install-user:
+        $(INSTALL)        -d ~/.ssh
+        $(INSTALL)        -t ~/.ssh $(SRC)/AnonymousAccessCommand
+        $(INSTALL) -m0600 -t ~/.ssh $(SRC)/sshd_config
+
+install-root:
+        $(ROOT_INSTALL)        -d "$(SSH_CONFIG_DIR)" "$(SSHD_CONFIG_DIR)" "$(SSH_LIB_DIR)" || true
         $(ROOT_INSTALL) -m0644 -t "$(SSHD_CONFIG_DIR)" $(SRC)/anonymous-access.conf || true
         $(ROOT_INSTALL)        -t "$(SSH_LIB_DIR)" $(SRC)/AuthorizedKeysCommand || true
         [ -e "$(SSH_LIB_DIR)"/AuthorizedKeysCommand ] || $(SUDO) ln -s -t /etc/ssh "$(SSH_LIB_DIR)"/AuthorizedKeysCommand
 
+run: install-user
+        /usr/sbin/sshd -D -e -f ~/.ssh/sshd_config
+
 README.html: README.md
-        pandoc -s --css style.css -t html $< -o $@
+        pandoc --metadata 'EndoForge - A self-forge in any git repository' -s --css style.css -t html $< -o $@
 
 test:
         make -C test