From 1c246434aa207f53d878f29b596b1d9519680c2f Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 9 Dec 2006 20:18:56 +0000 Subject: [PATCH] Slave driver --- Makefile | 15 ++++++++++++++- configDefault/apache.cfg | 2 +- configDefault/bind.cfg | 2 +- configDefault/exim.cfg | 2 +- configDefault/mailman.cfg | 2 +- src/main-slave.sml | 21 +++++++++++++++++++++ 6 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 src/main-slave.sml diff --git a/Makefile b/Makefile index dd84ab0..f32d0b0 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ COMMON_DEPS := configDefault/config.sig configDefault/configDefault.sml \ .PHONY: all mlton smlnj install -mlton: bin/domtool-server bin/domtool-client +mlton: bin/domtool-server bin/domtool-client bin/domtool-slave smlnj: $(COMMON_DEPS) openssl/smlnj/FFI/libssl.h.cm src/domtool.cm @@ -48,6 +48,12 @@ src/domtool-client.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb | sed 's/^\(.*\).lex$$/\1.lex.sml/' >src/domtool-client.mlb echo "main-client.sml" >>src/domtool-client.mlb +src/domtool-slave.mlb: Makefile src/prefix.mlb src/sources src/suffix.mlb + cat src/prefix.mlb src/sources src/suffix.mlb \ + | sed 's/^\(.*\).grm$$/\1.grm.sig\n\1.grm.sml/' \ + | sed 's/^\(.*\).lex$$/\1.lex.sml/' >src/domtool-slave.mlb + echo "main-slave.sml" >>src/domtool-slave.mlb + openssl/smlnj/FFI/libssl.h.cm: openssl/openssl_sml.h cd openssl/smlnj ; ml-nlffigen -d FFI -lh LibsslH.libh -include ../libssl-h.sml \ -cm libssl.h.cm -D__builtin_va_list="void*" \ @@ -76,8 +82,15 @@ bin/domtool-client: openssl/mlton/FFI/libssl.h.mlb \ $(COMMON_DEPS) src/*.sig src/*.sml mlton -output bin/domtool-client -link-opt -ldl src/domtool-client.mlb +bin/domtool-slave: openssl/mlton/FFI/libssl.h.mlb \ + src/domtool-slave.mlb src/domtool.lex.sml \ + src/domtool.grm.sig src/domtool.grm.sml \ + $(COMMON_DEPS) src/*.sig src/*.sml + mlton -output bin/domtool-slave -link-opt -ldl src/domtool-slave.mlb + install: cp scripts/domtool-publish /usr/local/sbin/ cp openssl/openssl_sml.so /usr/local/lib/ cp bin/domtool-server /usr/local/sbin/ + cp bin/domtool-slave /usr/local/sbin/ cp bin/domtool-client /usr/local/bin/domtool diff --git a/configDefault/apache.cfg b/configDefault/apache.cfg index 89f8b70..7e6f609 100644 --- a/configDefault/apache.cfg +++ b/configDefault/apache.cfg @@ -1,6 +1,6 @@ structure Apache :> APACHE_CONFIG = struct -val reload = "/usr/local/sbin/domtool-publish apache" +val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache" val confDir = "/var/domtool/vhosts" diff --git a/configDefault/bind.cfg b/configDefault/bind.cfg index f3aa9c1..faa61f3 100644 --- a/configDefault/bind.cfg +++ b/configDefault/bind.cfg @@ -7,6 +7,6 @@ val zonePath_real = "/etc/bind/zones" val namedConf = "/var/domtool/named.conf.local" -val reload = "/usr/local/sbin/domtool-publish bind" +val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish bind" end diff --git a/configDefault/exim.cfg b/configDefault/exim.cfg index 997b370..df73715 100644 --- a/configDefault/exim.cfg +++ b/configDefault/exim.cfg @@ -4,7 +4,7 @@ val aliases = "/var/domtool/aliases" val aliasesDefault = "/var/domtool/aliases.default" val handleDomains = "/var/domtool/local_domains.cfg" -val reload = "/usr/local/sbin/domtool-publish exim" +val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish exim" val aliasTo = ["deleuze"] diff --git a/configDefault/mailman.cfg b/configDefault/mailman.cfg index 017dd14..5be37df 100644 --- a/configDefault/mailman.cfg +++ b/configDefault/mailman.cfg @@ -4,6 +4,6 @@ val node = "deleuze" val mapFile = "/var/domtool/mailman.map" -val reload = "/usr/local/sbin/domtool-publish mailman" +val reload = "/usr/bin/sudo /usr/local/sbin/domtool-publish mailman" end diff --git a/src/main-slave.sml b/src/main-slave.sml new file mode 100644 index 0000000..b8ec9f9 --- /dev/null +++ b/src/main-slave.sml @@ -0,0 +1,21 @@ +(* HCoop Domtool (http://hcoop.sourceforge.net/) + * Copyright (c) 2006, Adam Chlipala + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + *) + +(* Driver for server *) + +val _ = Main.slave () -- 2.20.1