projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: ea80145)
closes #13838 "Merge branch '13838-site-conf-file'".
authorFernando Monserrat <fernando.monserrat@gmail.com>
Tue, 17 Jul 2018 18:49:33 +0000 (15:49 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Tue, 17 Jul 2018 18:49:33 +0000 (15:49 -0300)
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

Makefile patch | blob | history
etc/arvados/workbench2/workbench2.example.json [new file with mode: 0644] patch | blob

diff --git a/Makefile b/Makefile
index 30ab7bc4aca8e48159a96f214b5c756a16ae7f65..c28b4b86c360b0e4200af5f5eb6ef0513983da7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ $(DEB_FILE): build
         --iteration "$(ITERATION)" \
         --maintainer="$(MAINTAINER)" \
         --description="$(DESCRIPTION)" \
-        --deb-no-default-config-files \
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
        $(WORKSPACE)/build/=$(DEST_DIR)
 
 $(RPM_FILE): build
@@ -96,6 +96,7 @@ $(RPM_FILE): build
         --iteration "$(ITERATION)" \
         --maintainer="$(MAINTAINER)" \
         --description="$(DESCRIPTION)" \
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
         $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
diff --git a/etc/arvados/workbench2/workbench2.example.json b/etc/arvados/workbench2/workbench2.example.json
new file mode 100644 (file)
index 0000000..d790112
--- /dev/null
+++ b/etc/arvados/workbench2/workbench2.example.json
@@ -0,0 +1,3 @@
+{
+  "API_HOST": "CHANGE.TO.YOUR.ARVADOS.API.HOST" 
+}
\ No newline at end of file