From 47e0ac33299f1ffcf18d06ae1c058f54622b12bf Mon Sep 17 00:00:00 2001
From: -=yb4f310 <theunis.botha1@gmail.com>
Date: Wed, 10 May 2017 15:56:03 +0200
Subject: [PATCH] config update

---
 bash_history | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++
 config.js    |   2 +-
 start_editor |   4 +-
 3 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/bash_history b/bash_history
index 4026990..246d5dd 100644
--- a/bash_history
+++ b/bash_history
@@ -2268,3 +2268,127 @@ sudo rm default
 sudo ln -s ../sites-available/cybafelo.conf 
 sudo service nginx restart
 exit
+sudo apt-get install mongodb
+cd 
+c
+cd config/
+ls
+git diff
+git diff tj-dev
+git diff tj-dev 'exclude:bash_history'
+git diff . tj-dev 'exclude:bash_history'
+git diff tj-dev -- 'exclude:bash_history'
+git diff -- tj-dev 'exclude:bash_history'
+git diff -- tj-dev ':(exclude)bash_history'
+git diff tj-dev ':(exclude)bash_history'
+git diff tj-dev '!bash_history'
+git diff tj-dev !(bash_history)
+git diff tj-dev '!bash_history'
+git diff tj-dev !(bash_history)
+git checkout tj-dev -- start_api-v1.6
+vim start_api-v1.6 
+git status 
+git commit -am "cybafeloi update"
+gi tpuyhsg
+git push
+cd ..
+ls
+ls -l
+pm2
+sudo npm -
+sudo npm i -g pm2
+cd con
+cd config/
+git diff
+ls
+cd ..
+./build_latest 
+sudo npm install -g gulp
+top
+c
+cd config/
+git checkout tj-dev -- secure.js
+vim secure.js 
+ls -l
+vim secure.js 
+git status 
+git commit -am "temp ocmmit"
+git push
+git add nginx/sites-available/cybafelo.conf 
+git commit -am "cybafelo
+.c"
+git push
+git checkout tj-dev 
+git pull
+cd ..
+cd config/
+git checkout cybafelo 
+git checkout tj-dev -- config.js
+vim config.js 
+git diff
+git checkout tj-dev -- model.js
+git checkout tj-dev -- nginx/sites-available/gamewheel.conf
+git diff tj-dev -- nginx/sites-available/gamewheel.conf
+git diff nginx/sites-available/cybafelo.conf tj-dev -- nginx/sites-available/gamewheel.conf
+ls
+cd nginx/
+cd sites-available/
+ls
+vim gamewheel.conf 
+ls
+vim cybafelo.conf 
+vimdiff cybafelo.conf gamewheel.conf 
+mv gamewheel.conf cybafelo.conf 
+vim cybafelo.conf 
+s
+cd config/
+git checkout tj-dev -- secure.js
+vim secure.js 
+npm install npm@latest -f
+npm install npm@latest -g
+sudo npm install npm@latest -g
+npm install -g gulp
+c
+./dump 
+cd config/
+ls
+vim ./build_latest 
+cd ..
+ln -s config/build_latest 
+./build_latest 
+cp ~/config/checkout_all ./config/
+cd config/
+git add checkout_all 
+git status
+git add cybafelo.blend 
+git commit -am "checkout all"
+git pull
+git push
+la -l
+./checkout_all v2_v3_stable
+xs ..
+cd ..
+ln -s config/checkout_all 
+vim checkout_all 
+./checkout_all v2_v3_stable
+./build_latest 
+./checkout_all devq
+./checkout_all develop
+./checkout_all v2_v3_stable
+./build_latest 
+sudo apt-get install npm
+sudo npm install -g gulp
+./build_latest 
+npm update
+xrandr --output HDMI-1 --set "underscan hborder" 30 --set "underscan vborder" 18
+sudo xrandr --output HDMI-1 --set "underscan hborder" 30 --set "underscan vborder" 18
+gulp
+sudo apt-get install node
+sudo apt-get install nodejs
+node
+curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash -
+sudo apt-get install nodejs
+npm
+npm install -g gulp
+sudo vim /etc/hosts
+exit
diff --git a/config.js b/config.js
index c67567a..4839a2a 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 var environment = {
     path : '/usr/share/cybafelo',
-    protocol : 'https',
+    protocol : 'http',
     environment : 'tj',
     domain : 'cybafelo.com'
 };
diff --git a/start_editor b/start_editor
index 67f268b..65645c8 100755
--- a/start_editor
+++ b/start_editor
@@ -1,5 +1,3 @@
 #!/bin/bash
-cd /usr/share/cybafelo/api-v1
-pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1
 cd /usr/share/cybafelo/3d-editor
-pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor
\ No newline at end of file
+pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor