bootstrap: use locally built domtool-config when creating local-root

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index 89ae22c..1019e9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -264,6 +264,7 @@ install: install_sos
        cp src/plugins/domtool-postgres /usr/local/sbin/
        cp src/plugins/domtool-mysql /usr/local/sbin/
        -mkdir -p $(EMACS_DIR)
+       install -d -m 755 -o domtool -g nogroup /var/domtool
        cp elisp/*.el $(EMACS_DIR)/
 
 .PHONY: grab_lib install_server install_slave
@@ -271,19 +272,27 @@ install: install_sos
 grab_lib:
        rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
 
+install_systemd_dispatcher:
+       install -m 644 -o root -g root scripts/domtool-server.service /etc/systemd/system/domtool-slave.service
+       systemctl daemon-reload
+
+install_systemd_worker:
+       install -m 644 -o root -g root scripts/domtool-slave.service /etc/systemd/system/domtool-slave.service
+       systemctl daemon-reload
+
 install_serverslave:
-       /etc/init.d/domtool-server stop
-       /etc/init.d/domtool-slave stop
+       service domtool-server stop
+       service domtool-slave stop
        make install
-       /etc/init.d/domtool-server start
-       /etc/init.d/domtool-slave start
+       service domtool-server start
+       service domtool-slave start
 
 install_server:
-       /etc/init.d/domtool-server stop
+       service domtool-server stop
        make install
-       /etc/init.d/domtool-server start
+       service domtool-server start
 
 install_slave:
-       /etc/init.d/domtool-slave stop
+       service domtool-slave stop
        make install
-       /etc/init.d/domtool-slave start
+       service domtool-slave start