From 7adfd21a66846ebb907bdcfd411e00670d70fa06 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 11 Dec 2017 09:34:34 +0100 Subject: [PATCH] Fixed installed conf file name: agent-config.json. --- Makefile | 6 +++--- conf.d/etc/xds-agent/{config.json => agent-config.json} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename conf.d/etc/xds-agent/{config.json => agent-config.json} (100%) diff --git a/Makefile b/Makefile index 44e3d0a..1d5c909 100644 --- a/Makefile +++ b/Makefile @@ -118,10 +118,10 @@ fmt: tools/glide go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor) run: build/xds tools/syncthing/copytobin - $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info -c agent-config.json.in + $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS) debug: build/xds tools/syncthing/copytobin - $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug -c agent-config.json.in + $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_AGENT_DEBUG_ARGS) .PHONY: clean clean: @@ -158,7 +158,7 @@ package: clean tools/syncthing vendor build ifneq ($(GOOS), windows) @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)/ endif - @cp $(ROOT_SRCDIR)/conf.d/etc/xds-agent/config.json $(PACKAGE_DIR)/$(TARGET)/config.json.in + @cp $(ROOT_SRCDIR)/conf.d/etc/xds-agent/agent-config.json $(PACKAGE_DIR)/$(TARGET)/agent-config.json.in @cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET) @echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)" diff --git a/conf.d/etc/xds-agent/config.json b/conf.d/etc/xds-agent/agent-config.json similarity index 100% rename from conf.d/etc/xds-agent/config.json rename to conf.d/etc/xds-agent/agent-config.json -- 2.16.6