X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/b5c4918b3829e4f78ff688b050aa02b9bbd5bbde..c4a3e72446b05c87bbeb6f42f6c623ceb9c857c7:/Makefile

diff --git a/Makefile b/Makefile
index b290a59..9ccbeee 100644
--- a/Makefile
+++ b/Makefile
@@ -57,10 +57,15 @@ MAIN			 = lists.m4 base.m4
 MODES			 =
 
 MODES			+= satellite
-OPTIONS_satellite	 = satellite.m4
+OPTIONS_satellite	 = satellite.m4 sat-rewrite.m4
+
+MODES			+= srv
+HOOKS_srv		 = nosysdomain.m4
+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
 
 MODES			+= usersat
 OPTIONS_usersat		 = auth.m4 local.m4 satellite.m4
@@ -94,14 +99,19 @@ OTHERHOSTS		 = $(filter-out $(THISHOST), $(HOSTS))
 
 ROOT			 = sudo
 
+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
+
 install/$(THISHOST): exim4-$(call host-mode,$(THISHOST)).conf
-	$(ROOT) install -m644 $< /etc/exim4/exim4.conf
-	$(ROOT) service exim4 reload
+	$(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))