Merge pull request #1305 from johanneswuerbach/router-template

chore(router): Use unit file templates

Author: carmstrong

Makefile

@@ -66,9 +66,7 @@ install-data-containers: check-fleet
 
 install-routers: check-fleet
 	@$(foreach R, $(ROUTER_UNITS), \
-		cp router/systemd/deis-router.service ./$(R) ; \
-		$(FLEETCTL) load ./$(R) ; \
-		rm -f ./$(R) ; \
+		$(FLEETCTL) load router/systemd/$(R) ; \
 	)
 
 pull:

includes.mk

@@ -41,7 +41,7 @@ define echo_yellow
 endef
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-ROUTER_UNITS = $(shell seq -f "deis-router.%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
+ROUTER_UNITS = $(shell seq -f "deis-router@%g.service" -s " " $(DEIS_FIRST_ROUTER) 1 $(DEIS_LAST_ROUTER))
 
 check-fleet:
   @LOCAL_VERSION=`$(FLEETCTL) -version`; \

router/systemd/deis-router.service router/systemd/deis-router@.servicerouter/systemd/deis-router.service renamed to router/systemd/deis-router@.service

@@ -13,4 +13,4 @@ ExecStopPost=/usr/bin/docker stop deis-router
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-Conflicts=deis-router.*.service
+X-Conflicts=deis-router@*.service