A little more verbose on SSL context error; script for creating daemon certs

[hcoop/domtool2.git] / Makefile

diff --git a/Makefile b/Makefile
index 31f72ba..68feaf0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
 all: mlton
 
 COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \
-       openssl/openssl_sml.so
+       openssl/openssl_sml.so config.sml
+
+config.sml:
+       echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
 
 .PHONY: all mlton smlnj install
 
@@ -129,7 +132,7 @@ bin/vmail: $(COMMON_MLTON_DEPS) src/vmail.mlb
        $(MLTON) -output bin/vmail src/vmail.mlb
 
 bin/setsa: $(COMMON_MLTON_DEPS) src/setsa.mlb
-       $(MLTON) -output bin/setsa -ldl src/setsa.mlb
+       $(MLTON) -output bin/setsa src/setsa.mlb
 
 bin/smtplog: $(COMMON_MLTON_DEPS) src/smtplog.mlb
        $(MLTON) -output bin/smtplog src/smtplog.mlb
@@ -140,6 +143,7 @@ install:
        cp scripts/domtool-reset-local /usr/local/sbin/
        cp scripts/domtool-adduser /usr/local/bin/
        cp scripts/domtool-addcert /usr/local/bin/
+       cp scripts/domtool-addcert-daemon /usr/local/bin/
        cp scripts/domtool-addacl /usr/local/bin/
        cp scripts/domtool-rmuser /usr/local/bin/
        cp scripts/domtool-admin-sudo /usr/local/bin/
@@ -160,7 +164,17 @@ install:
        cp src/plugins/domtool-postgres /usr/local/sbin/
        cp src/plugins/domtool-mysql /usr/local/sbin/
 
-.PHONY: grab_lib
+.PHONY: grab_lib install_server install_slave
 
 grab_lib:
-       rsync --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+       rsync -r --delete /afs/hcoop.net/common/etc/domtool/lib/* lib/
+
+install_server:
+       sudo /etc/init.d/domtool-server stop
+       sudo make install
+       sudo /etc/init.d/domtool-server start
+
+install_slave:
+       sudo /etc/init.d/domtool-slave stop
+       sudo make install
+       sudo /etc/init.d/domtool-slave start