Merge pull request #39 from eviratec/issue/38

Issue/38
data-studio · Jul 24, 2017 · 68b80a5 · 68b80a5
2 parents 88521d2 + 2c57602
commit 68b80a5
Show file tree

Hide file tree

Showing 24 changed files with 1,299 additions and 310 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -46,6 +46,8 @@ Vagrant.configure("2") do |config|
     echo "DS_DB_USER=root" >> /etc/environment
     echo "DS_DB_PASS=dsvcdevmysql" >> /etc/environment
     echo "DS_DB_NAME=dsvcdev" >> /etc/environment
+    echo "DS_SERVER_NAME=api.datastudio.localhost" >> /etc/environment
+    echo "DS_SERVER_PROTOCOL=http" >> /etc/environment
     nohup npm start &
   SHELL
 end