MODES =
MODES += satellite
-OPTIONS_satellite = satellite.m4
+OPTIONS_satellite = satellite.m4 sat-rewrite.m4
+
+MODES += srv
+CONF_srv = sysdomains=
+OPTIONS_srv = exchange.m4 spam.m4 vhost.m4 sat-rewrite.m4
MODES += hub
-OPTIONS_hub = auth.m4 exchange.m4 local.m4 spam.m4 vhost.m4
+OPTIONS_hub = auth.m4 exchange.m4 local.m4 spam.m4
+OPTIONS_hub += user-spam.m4 vhost.m4 vhost-local.m4
MODES += usersat
OPTIONS_usersat = auth.m4 local.m4 satellite.m4
CONFIGS = $(foreach m, $(MODES), exim4-$m.conf)
TARGETS += $(CONFIGS)
$(CONFIGS): exim4-%.conf: $(EARLY) $$(HOOKS_$$*) $(MAIN) $$(OPTIONS_$$*)
- $(V_GEN)m4 -P -DMODE=$* $^ >$@.new
- $(V_AT)$(CHECK_$*)exim4 -C$@.new -bV >/dev/null
+ $(V_GEN)m4 -P -DMODE=$* $(CONF_$*:%=-DCONF_%) $^ >$@.new
+ $(V_AT)$(CHECK_$*)exim4 -C$$(pwd)/$@.new -bV >/dev/null
$(V_AT)mv $@.new $@
all: $(TARGETS)
ROOT = sudo
-install/$(THISHOST): exim4-$(call host-mode,$(THISHOST)).conf
- $(ROOT) install -m644 $< /etc/exim4/exim4.conf
- $(ROOT) service exim4 reload
+install_rune = \
+ exim4 -C/etc/exim4/exim4.conf.new -bV >/dev/null && \
+ mv /etc/exim4/exim4.conf.new /etc/exim4/exim4.conf && \
+ service exim4 reload
-show:
- : $(addprefix install/, $(OTHERHOSTS))
+install/$(THISHOST): exim4-$(call host-mode,$(THISHOST)).conf
+ $(ROOT) cp $< /etc/exim4/exim4.conf.new
+ $(ROOT) sh -c '$(install_rune)'
$(addprefix install/, $(OTHERHOSTS)): \
install/%: exim4-$$(call host-mode,$$*).conf
- $(ROOT) scp $< root@$*:/etc/exim4/exim4.conf
- $(ROOT) ssh root@$* service exim4 reload
+ $(ROOT) scp $< root@$*:/etc/exim4/exim4.conf.new
+ $(ROOT) ssh root@$* '$(install_rune)'
install: $(addprefix install/, $(HOSTS))