Makefile: Verify configurations before installing them.

Since we can't always verify them at the origin, this seems like an
important way of avoiding screwing things up badly.

diff --git a/Makefile b/Makefile
index b290a594cd718f81551f2abe3b8fb0fd008dc858..341208e47874a8b5b0fba99e5b4e73a47d06109d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,14 +94,19 @@ OTHERHOSTS           = $(filter-out $(THISHOST), $(HOSTS))
 
 ROOT                    = sudo
 
 
 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
 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
 
 $(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))
 
 
 install: $(addprefix install/, $(HOSTS))