From 2b5bbcb84f2c75bec27bd68a491a5c5403e30141 Mon Sep 17 00:00:00 2001
From: tstaubitz <tom.staubitz@googlemail.com>
Date: Thu, 10 Nov 2016 18:01:36 +0100
Subject: [PATCH] Update LOCAL_SETUP.md

---
 LOCAL_SETUP.md | 76 ++++++++++++--------------------------------------
 1 file changed, 18 insertions(+), 58 deletions(-)

diff --git a/LOCAL_SETUP.md b/LOCAL_SETUP.md
index 639e88a1..96de375b 100644
--- a/LOCAL_SETUP.md
+++ b/LOCAL_SETUP.md
@@ -6,67 +6,27 @@ Install Vagrant - https://www.vagrantup.com/docs/installation/
 Install VirtualBox - https://www.virtualbox.org/wiki/Downloads
 
 ## Install and setup
-Create a local codeOceanRoot:   mkdir /path/to/CodeOcean  
-==> codeOceanRoot = /path/to/CodeOcean 
-Clone Repository to codeOceanRoot - https://github.com/openHPI/codeocean
-==> repoPath = codeOceanRoot/xikolo-hands-on-programming
-cd repoPath/config
-duplicate .example config files (remove .example from filename)
-action_mailer.yml, database.yml, secrets.yml, sendmail.yml, smtp.yml
-add your local dbuser credentials to database.yml
-Linux users may need to add a "host" and a "port" parameter
-set path for /shared to codeOceanRoot/shared - double check this, when errors like "no target for make run available" arise, this is a likely cause. If in doubt, also check the paths in config/docker.yml match the relative structure, Linux users might need to use an absolute path)
-Copy vagrant files from https://github.com/hklement/vagrant-docker to codeOceanRoot or use boot2docker
-==> vagrantPath = codeOceanRoot/vagrant-docker-master
-cd vagrantPath
-open Vagrantfile in text editor of choice
-Execute: vagrant box add ubuntu/trusty64
-Execute: vagrant up
-Install docker environments
-export DOCKER_HOST=tcp://192.168.23.75:2375
-docker pull openhpi/docker_java
-docker pull openhpi/docker_ruby
-docker pull openhpi/docker_python
+### Clone repository 
+Create a local codeOceanRoot:   mkdir /path/to/CodeOcean  ==> codeOceanRoot = /path/to/CodeOcean 
+Clone Repository (https://github.com/openHPI/codeocean) to codeOceanRoot
+cd codeOceanRoot
 
-(The following images need to be moved to openhpi/docker_[coffee|sqlite|etc.] if they are required at some point.
-docker pull jprberlin/ubuntu-coffee
-docker pull jprberlin/ubuntu-sqlite
-docker pull jprberlin/ubuntu-sinatra
-docker pull jprberlin/ubuntu-html
-docker pull jprberlin/ubuntu-jruby)
-
-cd repoPath
-bundle install
- (make sure Postgres is running)
-Create database xikolo-hands-on-programming-development
-Open postgres commandline tool: psql
-mypostgresuser=# create database "xikolo-hands-on-programming-development";   
-rake db:schema:load 
-rake db:migrate
-rake db:seed
-Start
-Start application
-cd vagrantPath
+### Get Vagrant base image 
+vagrant box add ubuntu/trusty64
 vagrant up
-cd repoPath
-rails s -p 3333
-Open application in browser
-http://0.0.0.0:3333
-Stop application
-vagrant halt
 
-Run Tests
-Setup:
-Create database xikolo-hands-on-programming-test
-Open postgres commandline tool: psql
-mypostgresuser=# create database "xikolo-hands-on-programming-test"; 
+### Trouble shooting 
+ln -s /etc/nginx/sites-available/code_ocean /etc/nginx/sites-enabled <= Failed (no such directory)
 
-Run:
-Start vagrant
-vagrant up
-cd repoPath
-export DOCKER_HOST=tcp://192.168.23.75:2375
-bundle exec rspec
+vagrant ssh 
+sudo apt-get install nginx
+sudo ln -s /etc/nginx/sites-available/code_ocean /etc/nginx/sites-enabled
 
-Login
+### Start server
+vagrant ssh
+cd /vagrant
+rails s -p 3000
+
+### Login to CodeOcean
+192.168.59.104:3000
 admin@example.org:admin