aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 11:09:35 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 15:49:30 +0100
commit963931e04d44a5b40d38817163f52f56241a9f33 (patch)
tree986841498f9c998549ee175c240713709e32510a /Makefile
parente9fa58ca8a03f03e6022955fd4934e6fda5876ee (diff)
Standardized XDS config file name and location.
- config file name is : server-config.json - xds-server settings under user's home is: $HOME/.xds/server - xds-server settings under etc is: /etc/xds/server Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 39ab93b..86107f1 100644
--- a/Makefile
+++ b/Makefile
@@ -126,10 +126,10 @@ fmt: tools/glide
go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
run: build/xds tools/syncthing/copytobin
- $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info -c config.json.in
+ $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_SERVER_RUN_ARS)
debug: build/xds tools/syncthing/copytobin
- $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug -c config.json.in
+ $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_SERVER_DEBUG_ARGS)
.PHONY: clean
clean:
@@ -149,19 +149,18 @@ webapp/install:
.PHONY: scripts
scripts:
- @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-server-st*.sh scripts/xds-utils $(LOCAL_BINDIR)
+ @mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-utils $(LOCAL_BINDIR)
.PHONY: conffile
conffile:
- cat config.json.in \
- | sed -e s,"webapp/dist","$(DESTDIR_WWW)",g \
- | sed -e s,"\./bin","",g \
- > $(DESTDIR)/config.json.in
+ cat $(ROOT_SRCDIR)/conf.d/etc/xds/server/server-config.json \
+ | sed -e s,"www","$(DESTDIR_WWW)",g \
+ > $(DESTDIR)/server-config.json.in
.PHONY: install
install:
@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
- @test -e $(LOCAL_BINDIR)/xds-server-start.sh -a -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
+ @test -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
mkdir -p $(DESTDIR) \
&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)