r3-config

2018-04-12 10:58:35 +02:00 · 2018-04-12 10:58:35 +02:00 · adfa4329f0
parent 90ade90510
commit adfa4329f0
44 changed files with 46 additions and 13398 deletions
--- a/README.md
+++ b/README.md
@ -1,24 +1,10 @@
-#Configuration Package
-This is a central repository which aims to be a replacement
-for all configuration packages.
+#R3 - Configuration Package

-Every configuration lies in a different branch.
+This package contains all R3 configuration variables which should be unique to each deployment of R3

-Each branch corresponds to a server configuration, ex. tj-dev is for 
-TJ's dev machine. 
+config.js contains the client password

-gw-3d should be deployed on the gw-3d server
+secure.js should only be included 'server' side and contains the server password.

-if we have a gw-3d-beta server, this branch would be called gw-3d-beta
+For updates to the API to be successful (saving, deleting of components and uploads), these passwords have to match.

-and so on.
-
-Secure (Sensitive configuration options) go into secure.js.
-
-public configuration options go into config.js.
-
-config.js is linked to from every other package via symbolic link.
-
-When config.js is required server side, it is automatically merged
-with secure.js in order to produce a global server side configuration,
-whilst only exposing config.js public to client side.
--- a/13
+++ b/13
@ -2,17 +2,12 @@ alias c='cd /usr/share/cybafelo'
 alias s='cd /usr/share/cybafelo && ./start'
 alias d='cd /usr/share/cybafelo && ./delete'
 alias st='cd /usr/share/cybafelo && ./stop'
-alias gl='cd /usr/share/cybafelo/game-lib'
-alias p='cd /usr/share/cybafelo/preview'
-alias 3d='cd /usr/share/cybafelo/3d-editor'
-alias api='cd /usr/share/cybafelo && ./start_api'
-alias app='cd /usr/share/cybafelo && ./start_app'
-alias port='cd /usr/share/cybafelo && ./start_port'
-alias gate='cd /usr/share/cybafelo && ./start_gate'
-alias e1='cd /usr/share/cybafelo && ./start_editor'
+alias r3='cd /usr/share/cybafelo/r3'
+alias p='cd /usr/share/cybafelo/r3-portal'
+alias e='cd /usr/share/cybafelo/r3-3ditor'
+alias a='cd /usr/share/cybafelo/r3-api'
 alias logs='cd /usr/share/cybafelo && ./logs'
 alias m='pm2 monit'
-alias list='pm2 list'
 function r() {
    /usr/share/cybafelo/restart "$@"
 }
--- a/12358
+++ b/12358
--- a/115
+++ b/115
@ -1,115 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000000
-HISTFILESIZE=200000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-GIT_PS1_SHOWDIRTYSTATE=true
-GIT_PS1_SHOWUNTRACKEDFILES=true
-
-if [ "$color_prompt" = yes ]; then
-	PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\][\D{%d}] \A\[\033[1;31m\] \u@\[\033[01;32m\]-=<yb4f310:\w>\[\033[00m\]\[\033[0;33m\]$(__git_ps1)\[\033[00m\] \$ '
-else
-	PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\][\D{%d}] \A\[\033[1;31m\] \u@\[\033[01;32m\]-=<yb4f310:\w>\[\033[00m\]\[\033[0;33m\]$(__git_ps1)\[\033[00m\] \$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-	PS1='${debian_chroot:+($debian_chroot)}\[\033[38;5;34m\]-\[\033[38;5;35m\]=\[\033[38;5;36m\]<\[\033[38;5;37m\]y\[\033[38;5;38m\]b\[\033[38;5;39m\]4\[\033[38;5;40m\]f\[\033[38;5;42m\]3\[\033[38;5;43m\]1\[\033[38;5;87m\]0\[\033[38;5;34m\]\w\[\033[38;5;199m\]/\[\033[38;5;104m\]$(__git_ps1 "(%s)\[\033[38;5;199m\]/")\[\033[38;5;117m\]'
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls -l -a --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto -n'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-alias mysql='mysql -A'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-alias composer='php /usr/local/bin/composer.phar'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-
-
-export PATH=`pwd`/depot_tools:"$PATH"
--- a/clients.js
+++ b/clients.js
@ -1,69 +0,0 @@
-var clients = {
-    '3d-pong' : {
-        title : "Gamewheel Multiplayer VR Pong",
-        ogUrl : "http://3d-pong.cybafelo.local",
-        ogType : "website",
-        ogTitle : "Gamewheel Multiplayer VR Pong",
-        ogDescription : "Games is our game",
-        ogImage : "http://3d-pong.cybafelo.local/pong_image.png",
-        ctaUrl : "https://www.cybafelo.local",
-        account : 'root',
-        subAccount : 'root',
-        nameOfTheGame : 'pong',
-        messageItemStart : 'VR Pong - Invite your friends to play!',
-        messageItemEnd : [
-            'Challenge your friends :)'
-        ],
-        endSceneIndex : {
-            'default': {
-                title : 'Great Job!',
-                message : 'Challenge your friends or learn more about Gamewheel',
-                cta : 'https://www.cybafelo.local',
-                quote : 'VR PONG!'
-            }
-        }
-    },
-    '3doo' : {
-        title : "3doo - VR Pong",
-        ogUrl : "http://3doo.cybafelo.local",
-        ogType : "website",
-        ogTitle : "3doo – VR App",
-        ogDescription : "Spiele PONG in 3d und VR mit 3doo",
-        ogImage : "http://3doo.cybafelo.local/pong_image.png",
-        ctaUrl : "https://3doo.com",
-        account : '3doo',
-        subAccount : 'root',
-        nameOfTheGame : 'pong',
-        messageItemStart : '3doo VR Pong - Invite your friends to play!',
-        messageItemEnd : [
-            'Please install our<br/>&nbsp;<b>3doo Movie Player App</b>&nbsp;<br/>using the following link<br/> to watch <b>your free movie</b>',
-            '<b>Want more?</b><br/>&nbsp;Download our<br/>&nbsp;<b>3doo Movie Player App.</b>',
-            '<b>Want even more fun?</b><br/>&nbsp;Invite your friends&nbsp;<br/><b>AND BEAT \'EM!</b>',
-            '<b>Like to win?</b><br/>&nbsp;Challenge more friends&nbsp;<br/><b>AND BEAT \'EM!</b>'
-        ],
-        endSceneIndex : {
-            'default': {
-                title : 'Great Job!',
-                message : 'Challenge your friends<br/> AND BEAT ‘EM <br/>or learn more about 3doo.<br/>',
-                cta : 'https://app.adjust.com/9lxsna',
-                quote : 'Try this awesome 3doo VR game – and beat me!'
-            },
-            'alternate' : {
-                title : 'Great Job!',
-                message : 'Install our 3doo App now to watch the free movie!',
-                cta : 'https://app.adjust.com/m0ewt7',
-                quote : 'I just won free a 3doo movie by playing a VR game. Check it out'
-            },
-            'app' : {
-                title : 'Great Job!',
-                message : 'Challenge friends <br/>AND BEAT ‘EM <br/>or learn more about 3doo.',
-                cta : 'https://3doo.com',
-                quote : 'Just discovered a cool VR game in the 3doo app. Check it out!'
-            }
-        }
-
-
-    }
-};
-
-module.exports = clients;
--- a/config.js
+++ b/config.js
@ -2,75 +2,33 @@ var environment = {
    path : '/usr/share/cybafelo',
    protocol : 'http',
    environment : 'tj',
-    domain : 'cybafelo.local'
+    domain : 'cybafelo.local',
+    remoteDomain : 'cybafelo.com'
 };

-var protocol    = environment.protocol;
-var user        = environment.environment;
-var domain      = environment.domain;
+var protocol        = environment.protocol;
+var user            = environment.environment;
+var domain          = environment.domain;
+var remoteDomain    = environment.remoteDomain;

 var config = {
-    vr_pong: {
-        url: protocol + '://' + user + '-3d-pong.' + domain
-    },
-    vr_racer: {
-        url: protocol + '://' + user + '-3d-racing.' + domain
-    },
    editor: {
-        url: protocol + '://' + user + '-3d-editor.' + domain,
+        url: protocol + '://' + user + '-r3-3ditor.' + domain,
        default: {
            platform: 'cybafelo',
            account: 'root',
            subAccount: 'root',
-            nameOfTheGame: 'test'
+            package: 'test'
        }
    },
-    api16: {
-        url: protocol + '://' + user + '-api-v1.' + domain,
-        remoteUrl: protocol + '://live-api-v1.flyingspoon.de',
-		uploadPath: '/uploads',
-        impactUrl : 'http://tj-api-v1.cybafelo.local/impact'
-    },
-    tools: {
-        url: protocol + '://' + user + '-tools.' + domain,
-        default: {
-            platform: 'cybafelo',
-            account: 'root',
-            subAccount: 'root'
-        }
-    },
-    app: {
-        url: protocol + '://' + user + '-app.' + domain
-    },
-    preview: {
-        url: protocol + '://' + user + '-preview.' + domain
-    },
    api: {
-        url: protocol + '://' + user + '-api.' + domain
+        url: protocol + '://' + user + '-r3-api.' + domain,
+        remoteUrl: protocol + '://' + user + '-r3-api.' + remoteDomain,
+		uploadPath: '/uploads',
+		clientPassword: '"kent sent me" motherfucker!'
    },
-    cdn: {
-        url: protocol + '://' + user + '-cdn.' + domain
-    },
-    gate: {
-        url: protocol + '://' + user + '-gate.' + domain
-    },
-    content: {
-        url: protocol + '://' + user + '-content.' + domain
-    },
-    asset: {
-        url: protocol + '://' + user + '-asset.' + domain
-    },
-    port: {
-        url: protocol + '://' + user + '-port.' + domain
-    },
-    cron: {
-        url: protocol + '://' + user + '-cron.' + domain
-    },
-    analytics: {
-        url: protocol + '://' + user + '-analytics.' + domain
-    },
-    environment: {
-        mode: 'development'
+    portal: {
+        url: protocol + '://' + user + '-r3-portal.' + domain
    },
    db: {}
 };
@ -80,8 +38,6 @@ if (typeof module !== 'undefined') {
    if (typeof require !== 'undefined') {
        var _ = require('lodash');
        _.merge(config, require('./secure'));
-        _.merge(config, require('./connection'));
-        _.merge(config, require('./model'));
    }

 	module.exports = config;
--- a/connection.js
+++ b/connection.js
@ -1,20 +0,0 @@
-var config = {
-    connection: {
-        model: {
-            // 
-            // default model connection
-            default: 'connect/connect.mongoose'
-        }
-    },
-
-    schema: {
-        model: {
-            //
-            // default schema
-            default: 'connect/schema.mongoose'
-        }
-    }
-};
-
-
-if (!!module) { module.exports = config; }
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-#!/bin/bash
-
-#for package in $()
-for dir in /usr/share/cybafelo/*/
-do
-	dir_short_name=${dir%*/}
-	dir_short_name=${dir_short_name##*/}
-
-	if [ -d "$dir/.git" ]; then
-		echo "===========================starting============================ $dir_short_name"
-		cd $dir
-		git pull --all
-		echo "=============================done=============================="
-	fi
-done
--- a/general.encrypted
+++ b/general.encrypted
--- a/17
+++ b/17
@ -1,17 +0,0 @@
-127.0.0.1	localhost
-
-127.0.1.1	cfo_plista
-127.0.1.1	cfo_plista.cybafelo.local
-
-127.0.1.1   tj-3d-editor.cybafelo.local
-127.0.1.1   tj-api-v1.cybafelo.local
-127.0.1.1   tj-preview.cybafelo.local
-
-192.168.44.185  kibana.sirius.internal
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
--- a/4
+++ b/4
@ -1,4 +0,0 @@
-"\e[A": history-search-backward
-"\e[B": history-search-forward
-"\e[1;5C": forward-word
-"\e[1;5D": backward-word
--- a/model.js
+++ b/model.js
@ -1,25 +0,0 @@
-var config = {
-    model: {
-        connection: {
-            // 
-            // default model connection
-            default         : 'connect/connect.mongoose.general',
-            ticket          : 'connect/connect.memcached',
-            gamestate       : 'connect/connect.memcached',
-            job             : 'connect/connect.memory',
-            // event           : 'connect/connect.mongoose.statistics',
-            content_state    : 'connect/connect.mongoose.statistics'
-        },
-        schema: {
-            //
-            // default schema
-            default     : 'connect/schema.mongoose',
-            ticket      : 'connect/schema.memcached',
-            gamestate   : 'connect/schema.memcached',
-            job         : 'connect/schema.memory'
-        }
-    }
-};
-
-
-if (!!module) { module.exports = exports = config; }
--- a/nginx/conf.d/ports.conf
+++ b/nginx/conf.d/ports.conf
@ -1,59 +0,0 @@
-upstream 3d-pong {
-    server 127.0.0.1:3101;
-}
-
-upstream 3d-racing {
-    server 127.0.0.1:3102;
-}
-
-upstream mail {
-    server 127.0.0.1:9024;
-}
-
-upstream 3d-editor {
-    server 127.0.0.1:3103;
-}
-
-upstream api-v1 {
-    server 127.0.0.1:3104;
-}
-
-upstream tools {
-    server 127.0.0.1:3109;
-}
-
-upstream app {
-    server 127.0.0.1:3110;
-}
-
-upstream api {
-    server 127.0.0.1:3111;
-}
-
-upstream port {
-    server 127.0.0.1:3114;
-}
-
-upstream gamestate {
-    server 127.0.0.1:3114;
-}
-
-upstream gate {
-    server 127.0.0.1:3115;
-}
-
-upstream content {
-    server 127.0.0.1:3115;
-}
-
-upstream asset {
-    server 127.0.0.1:3115;
-}
-
-upstream cron {
-    server 127.0.0.1:3116;
-}
-
-upstream php {
-    server 127.0.0.1:9001;
-}
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@ -1,105 +0,0 @@
-user www-data;
-worker_processes 4;
-pid /run/nginx.pid;
-
-events {
-	worker_connections 768;
-	# multi_accept on;
-}
-
-http {
-
-	##
-	# Basic Settings
-	##
-
-	sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 65;
-	types_hash_max_size 2048;
-	# server_tokens off;
-
-	# server_names_hash_bucket_size 64;
-	# server_name_in_redirect off;
-
-	include /etc/nginx/mime.types;
-	default_type application/octet-stream;
-
-	client_max_body_size 1024M;
-
-	##
-	# Logging Settings
-	##
-    log_format custom_access '$request_method ($status) : $host$request_uri';
-    access_log /var/log/nginx/access.log custom_access;
-
-    error_log /var/log/nginx/error.log;
-
-	##
-	# Timeout Settings
-	##
-
-	fastcgi_read_timeout 6000;
-	proxy_read_timeout 6000;
-
-	##
-	# Gzip Settings
-	##
-
-	gzip on;
-	gzip_disable "msie6";
-
-	gzip_vary on;
-	gzip_proxied any;
-	gzip_comp_level 2;
-	gzip_buffers 16 8k;
-	gzip_http_version 1.1;
-	gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-
-	##
-	# nginx-naxsi config
-	##
-	# Uncomment it if you installed nginx-naxsi
-	##
-
-	#include /etc/nginx/naxsi_core.rules;
-
-	##
-	# nginx-passenger config
-	##
-	# Uncomment it if you installed nginx-passenger
-	##
-	
-	#passenger_root /usr;
-	#passenger_ruby /usr/bin/ruby;
-
-	##
-	# Virtual Host Configs
-	##
-
-	include /etc/nginx/conf.d/*.conf;
-	include /etc/nginx/sites-enabled/*;
-}
-
-
-#mail {
-#	# See sample authentication script at:
-#	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
-# 
-#	# auth_http localhost/auth.php;
-#	# pop3_capabilities "TOP" "USER";
-#	# imap_capabilities "IMAP4rev1" "UIDPLUS";
-# 
-#	server {
-#		listen     localhost:110;
-#		protocol   pop3;
-#		proxy      on;
-#	}
-# 
-#	server {
-#		listen     localhost:143;
-#		protocol   imap;
-#		proxy      on;
-#	}
-#}
--- a/nginx/sites-available/default
+++ b/nginx/sites-available/default
@ -1,91 +0,0 @@
-##
-# You should look at the following URL's in order to grasp a solid understanding
-# of Nginx configuration files in order to fully unleash the power of Nginx.
-# https://www.nginx.com/resources/wiki/start/
-# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
-# https://wiki.debian.org/Nginx/DirectoryStructure
-#
-# In most cases, administrators will remove this file from sites-enabled/ and
-# leave it as reference inside of sites-available where it will continue to be
-# updated by the nginx packaging team.
-#
-# This file will automatically load configuration files provided by other
-# applications, such as Drupal or Wordpress. These applications will be made
-# available underneath a path with that package name, such as /drupal8.
-#
-# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
-##
-
-# Default server configuration
-#
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server;
-
-	# SSL configuration
-	#
-	# listen 443 ssl default_server;
-	# listen [::]:443 ssl default_server;
-	#
-	# Note: You should disable gzip for SSL traffic.
-	# See: https://bugs.debian.org/773332
-	#
-	# Read up on ssl_ciphers to ensure a secure configuration.
-	# See: https://bugs.debian.org/765782
-	#
-	# Self signed certs generated by the ssl-cert package
-	# Don't use them in a production server!
-	#
-	# include snippets/snakeoil.conf;
-
-	root /var/www/html;
-
-	# Add index.php to the list if you are using PHP
-	index index.html index.htm index.nginx-debian.html;
-
-	server_name _;
-
-	location / {
-		# First attempt to serve request as file, then
-		# as directory, then fall back to displaying a 404.
-		try_files $uri $uri/ =404;
-	}
-
-	# pass PHP scripts to FastCGI server
-	#
-	#location ~ \.php$ {
-	#	include snippets/fastcgi-php.conf;
-	#
-	#	# With php-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
-	#	# With php-cgi (or other tcp sockets):
-	#	fastcgi_pass 127.0.0.1:9000;
-	#}
-
-	# deny access to .htaccess files, if Apache's document root
-	# concurs with nginx's one
-	#
-	#location ~ /\.ht {
-	#	deny all;
-	#}
-}
-
-
-# Virtual Host configuration for example.com
-#
-# You can move that to a different file under sites-available/ and symlink that
-# to sites-enabled/ to enable it.
-#
-#server {
-#	listen 80;
-#	listen [::]:80;
-#
-#	server_name example.com;
-#
-#	root /var/www/example.com;
-#	index index.html;
-#
-#	location / {
-#		try_files $uri $uri/ =404;
-#	}
-#}
--- a/nginx/sites-available/cybafelo.conf
+++ b/nginx/sites-available/cybafelo.conf
@ -1,4 +1,16 @@
+# Define our node ports
+upstream r3-api {
+    server 127.0.0.1:3104;
+}
+
+upstream php {
+    server 127.0.0.1:9001;
+}	
+
+# Now define our sites
 server {
+
+	#listen 443 ssl default_server;
    listen 80 default_server;
    listen [::]:80 default_server ipv6only=on;

@ -70,9 +82,9 @@ server {
        proxy_set_header X-NginX-Proxy true;

        # Set Environment, App, and Domain
-        proxy_set_header X-Gamewheel-Env $environment;
-        proxy_set_header X-Gamewheel-App $app;
-        proxy_set_header X-Gamewheel-Host $host_domain;
+        proxy_set_header X-R3-Env $environment;
+        proxy_set_header X-R3-App $app;
+        proxy_set_header X-R3-Host $host_domain;

        # Pass Everything to our app
        proxy_pass http://$app;
@ -81,3 +93,4 @@ server {
        proxy_redirect off;
 	}
 }
+
--- a/nginx/ssl/gamewheel.com.crt
+++ b/nginx/ssl/gamewheel.com.crt
@ -1,123 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIFVDCCBDygAwIBAgIQIsyWkQe0NoNQqLjtNcpgbjANBgkqhkiG9w0BAQsFADCB
-kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNjEwMjAwMDAwMDBaFw0xODEwMjEyMzU5NTlaMFwxITAfBgNVBAsTGERv
-bWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UECxMUUG9zaXRpdmVTU0wgV2ls
-ZGNhcmQxGDAWBgNVBAMMDyouZ2FtZXdoZWVsLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMTjZQBWf5uyidrbWAujcAymY7144oxklA6D+0lREUph
-BVwME5973AI+Fqr6sJAXzycz0oN3WyIarywDLJnxyyiqt4kmAM7nSr9KE0BpJjj5
-ajyySIABrX7SGAGGHo8R5O46MAc9hotmXwy1CCt9Vt224QN/Upv/PJ/13Av+rsA2
-NPQfnhv/jVt/823ta3ImVLnGMigJM+BKHWmcawu8m/qqX46RiSQaXB9o9r5PtldC
-kZHM0VkoyJfvmkCwQ9Zc7Qo3etrPDtuUu4WQycw1DjQ2Ihx5IxiE4wHDUbrzW/4j
-k+BTVodRIArh5g8R1WhZmRpSdX9Pk6/qymQEvg2r8ecCAwEAAaOCAdswggHXMB8G
-A1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBRh3vjVLvyl
-QstTxMMuObTylE+RiTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTwYDVR0gBEgwRjA6BgsrBgEEAbIx
-AQICBzArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8uY29tL0NQ
-UzAIBgZngQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9j
-YS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNy
-bDCBhQYIKwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9k
-b2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0Eu
-Y3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wKQYDVR0R
-BCIwIIIPKi5nYW1ld2hlZWwuY29tgg1nYW1ld2hlZWwuY29tMA0GCSqGSIb3DQEB
-CwUAA4IBAQBh7DIM8ZBIhYURjVwW5xBN+ciKogK/o7uM/Dix5+LvbMoIZs704ir5
-wAfZXLAayU3uKNg9ZJmkyI32mGnwlt61Z8pzoK2AvqcFR8t68We2B3ic0dOupfbI
-4Z8Ll9gcqEsmMrGuo7XWQtEVSUg1S6rQAhe0G424KAB4OlGohRDkffmhSp6R5NrW
-qbZlXRXnQeUoa2WF5C8ElplETv6M2QSYXfup0hMU2tY76Pg7ymphm2OliXTdUNIl
-G+DCal3CEjuCwoubPY/EuXKJ5PN5563qHz1xOSKzCcOQlO8Tngs2MSfiMouPIgD/
-bKUlWoJv8UkIybOiMITe1zxHnV3Klzvd
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
-hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
-BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy
-MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
-EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh
-bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh
-bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0
-Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6
-ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51
-UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n
-c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz
-30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG
-BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv
-bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB
-AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
-T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
-ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p
-mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/
-e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps
-P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY
-dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc
-2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG
-V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4
-HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX
-j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII
-0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap
-lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf
-+AZxAeKCINT+b72x
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
-gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
-VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
-AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
-2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
-ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
-4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
-m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
-vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
-8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
-IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
-KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
-GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
-s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
-JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
-AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
-MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
-bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
-zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
-Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
-Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
-B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
-PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
-pu/xO28QOG8=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-----END CERTIFICATE-----
--- a/nginx/ssl/gamewheel.com.key
+++ b/nginx/ssl/gamewheel.com.key
@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDE42UAVn+bsona
-21gLo3AMpmO9eOKMZJQOg/tJURFKYQVcDBOfe9wCPhaq+rCQF88nM9KDd1siGq8s
-AyyZ8csoqreJJgDO50q/ShNAaSY4+Wo8skiAAa1+0hgBhh6PEeTuOjAHPYaLZl8M
-tQgrfVbdtuEDf1Kb/zyf9dwL/q7ANjT0H54b/41bf/Nt7WtyJlS5xjIoCTPgSh1p
-nGsLvJv6ql+OkYkkGlwfaPa+T7ZXQpGRzNFZKMiX75pAsEPWXO0KN3razw7blLuF
-kMnMNQ40NiIceSMYhOMBw1G681v+I5PgU1aHUSAK4eYPEdVoWZkaUnV/T5Ov6spk
-BL4Nq/HnAgMBAAECggEBAKmQlZnW5Qu4ldUw9wD+/y9F1byGccYrkP93V2FrOhLu
-v+joVbYSvAYKZwdV494VQ0kl7nVew9P5W0fya+UhQrCBZpPtcODAfbWFHFNqu4px
-87bWbG4iA8OnORmG4qag6KLq5hY2PLutrMqK1sBtr/Q+3kdezkyfYxz4Z0zFSMcr
-4uDEvwjCzpzkLCdk9L0uftwrTgtdJUuNJ9X3YMr9Sb27G+bMpVdrqSVHREafXwNH
-sFfxMM6Nm7pTtHN3+dDqBcMGlRD2rnQiK3YyXvPJc5RPeQ1GEhlkqyfOT6CS6MQp
-9gZ9wWC26vKOT2AWjkvFxx6/roiqFKjiimM8z+2SSBECgYEA+//9tAa/Qjk2verC
-ouuVZZ/Fx2HuBmFdI5WZteW0tqb/jG3xcIblXPdXlgM+x0r44/r1hMMqThdKtxvt
-0GEIN9BReZ1iCfIhkkdLil6NBgONjiWE7ZcjMSqgNfOt1xwjqwEKtBYoSD0yqEye
-iMKevNFc18FtBmFv1XJ9loDMv6UCgYEAyAN0njHxuuugyYxXmpHtRShXsNGvTKAN
-SAtnO1st0cYNUCONi3cKKN74RUgW7Ca8hZ0lzGavgLwZhaG5KlAOzT36nUSFTjsw
-KaGzij0BYLC7GGbTHrGQjegvOKFL/WhjFbo/LH7Ry/VyfchfzbPjy4cqn2++CxDt
-JiyYNAMv9ZsCgYBeqfR5K0uvqeR5hXXmU89EZLecRZpvxSWC15DtdsPjFWrMKwTW
-u6XvvW6miMONhAlpQv32CIac3T0Q+ink7H500Qm6QLfyeoXH+IZVDV22k6Eac9ey
-lOMAdj3G5qo4M3bmpzaJHgW11V9xP48SWuHcll1lI2E8U1/6c87fubSwjQKBgCRu
-RLJ/xFjYjDvJvTchN0dudrJ1LunVCTZDJXVxQSJBYbFkGGb7srUJD82GuO4gjBwG
-KJlXZsYa/McTUue7F0cY7+nvThyWuUoL8ujN/c8/wYRLTk775qmCTf+RmYa5mbqe
-Zt1S6CGvPkBc295a0rYCk6fgsYvQdHGMk9h9cCHbAoGAIJaceplG99r1R2gA1PH0
-EccY0SJpEYnpjgRTTSnQZq4Z00jd17bsxN/4iKCvPK4JXje4MnJix6NAHbUMT0Pg
-kg0aqEy4qS17dsuFAKMCWWfGkNtKV8cfAjtHTNDUNL+ZriUXcDWYKcUMWDJCuQao
-xibQQXt204Ba4Ti834RKQso=
-----END PRIVATE KEY-----
--- a/nginx/ssl/ssl.conf
+++ b/nginx/ssl/ssl.conf
@ -1,8 +0,0 @@
-	ssl_certificate ssl/cybafelo.local.crt;
-	ssl_certificate_key ssl/cybafelo.local.key;
-	ssl_session_timeout 5m;
-    ## Don't use SSL v3 because of POODLE vulnerability
-    #	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-	ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-	ssl_prefer_server_ciphers on;
--- a/pong.conf
+++ b/pong.conf
@ -1,32 +0,0 @@
-server {
-	listen		80;
-
-	server_name	pong.cybafelo.local pong-debug.cybafelo.local;
-	
-	root		/srv/cybafelo.local/vr_pong;
-
-	index		index.html; 
-	
-	access_log /var/log/nginx/3d-editor.cybafelo.local.access.log;
-	error_log /var/log/nginx/3d-editor.cybafelo.local.error.log;
-	
-	add_header Access-Control-Allow-Origin *;
-
-	location / {
-		try_files $uri $uri/ @node;
-	}
-
-	location @node {
-		proxy_pass_request_headers on;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-NginX-Proxy true;
-		proxy_pass http://127.0.0.1:3101;
-		proxy_ssl_session_reuse off;
-		proxy_set_header Host $http_host;
-		proxy_redirect off;
-		proxy_read_timeout 99999s;
-		proxy_connect_timeout 99999s;
-		proxy_send_timeout 99999s;
-	}
-}
--- a/progress-dot-on.png
+++ b/progress-dot-on.png
--- a/progress-dot-on16.png
+++ b/progress-dot-on16.png
--- a/progress_dot_on.png
+++ b/progress_dot_on.png
--- a/progress_dot_on16.png
+++ b/progress_dot_on16.png
--- a/secure.js
+++ b/secure.js
@ -1,22 +1,13 @@
 var secure = {
-    vr_pong: {
-        port: 3101,
-        debugPort: 3201
-    },
-    vr_racer: {
-        port: 3102,
-        debugPort: 3202
-    },
    editor: {
        port: 3103,
        debugPort: 3203,
        cluster: false
    },
-    api16: {
+    api: {
        port: 3104,
        debugPort: 3204,
        cluster: false,
-        cors: false,
        mailer: {
            host: 'localhost',
            port: 9025,
@ -25,120 +16,11 @@ var secure = {
            ignoreTLS: true
        },
        sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23',
-        customCodePath: '/usr/share/cybafelo/custom-code'
-    },
-    tools: {
-        port: 3109,
-        debugPort: 3209,
-        liveReloadPort: 3409,
-        mysqlUserExport: {
-            host: "127.0.0.1",
-            port: 3306,
-            user: "root",
-            password: "",
-            database: "gw_core"
-        },
-        mongoUserImport: {
-            host: "127.0.0.1",
-            port: 27017,
-            options: {
-                user: '',
-                pass: ''
-            }
-        }
-    },
-    app: {
-        port: 3110,
-        debugPort: 3210,
-        liveReloadPort: 3410
-    },
-    api: {
-        port: 3111,
-        debugPort: 3211,
-        liveReloadPort: 3411,
-        uploadPath : 'uploads',
-        // mailer: {
-        //     host: "smtp.office365.com",
-        //     port: 587,
-        //     auth: {
-        //         user: "admin@cybafelo.local",
-        //         pass: "Toypro42!"
-        //     },
-        //     secureConnection: false,
-        //     tls: {
-        //         ciphers: "SSLv3",
-        //         rejectUnauthorized: false
-        //     },
-        //     emails: {
-        //         founder: "evgeni@cybafelo.local",
-        //         support: "support@cybafelo.local"
-        //     }
-        // },
-        mailer: {
-            host: 'localhost',
-            port: 25,
-            secure: false,
-            debug: true,
-            ignoreTLS: true
-        },
-        sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
-    },
-    port: {
-        port: 3114,
-        debugPort: 3214
-    },
-    gate: {
-        port: 3115,
-        debugPort: 3215
-    },
-    cron: {
-        port: 3116,
-        debugPort: 3216,
-        apiUser : 'tj@cybafelo.local',
-        apiPassword : 'test12345'
+        customCodePath: '/usr/share/cybafelo/r3-custom-code',
+	    serverPassword: '"kent sent me" motherfucker!'
    },
    db : {
        mongo : {
-            analytics : {
-                host: 'mongodb://127.0.0.1',
-                db: 'analyticsDev',
-                port: 27017,
-                shardPort: 27018,
-                options: {
-                    db: {
-                        native_parser: true
-                    },
-                    server: {
-                        poolSize: 5,
-                        keepAlive: 120
-                    },
-                    user: '',
-                    pass: '',
-                    autoIndex: false
-                }
-            },
-            statistics : {
-                host: 'mongodb://127.0.0.1',
-                db: 'statistic'
-            },
-            general : {
-                host: 'mongodb://127.0.0.1',
-                db: 'releaseTJ',
-                port: 27017,
-                shardPort: 27018,
-                options: {
-                    db: {
-                        native_parser: true
-                    },
-                    server: {
-                        poolSize: 5,
-                        keepAlive: 120
-                    },
-                    user: '',
-                    pass: '',
-                    autoIndex: false
-                }
-            },
            original : {
                host: 'mongodb://127.0.0.1',
                db: 'cybafelo',
@ -157,20 +39,6 @@ var secure = {
                    autoIndex: false
                }
            }
-        },
-        mysql : {
-            statistics : {
-                host        : '127.0.0.1',
-                user        : 'root',
-                password    : '',
-                database    : 'gw_core'
-            }
-        },
-        memcached : {
-            statistics : {
-                host : '127.0.0.1',
-                port : 11211
-            }
        }
    }
 };
--- a/2
+++ b/2
@ -1,4 +1,4 @@
 #!/bin/bash
 cd /usr/share/cybafelo
-./start_api-v1.6
+./start_r3_api

--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/api
-pm2 start bin/start --node-args="--inspect=3211" --name api
--- a/start_api-v1.6
+++ b/start_api-v1.6
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/api-v1
-pm2 start bin/start --node-args="--debug=3204" --name "api-v1.6"
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/app
-pm2 start bin/start --node-args="--inspect=3210" --name app
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/gamewheel/cron
-pm2 start bin/start --node-args="--inspect=3216" --name cron
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/3d-editor
-pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3203" --name 3d-editor
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/gate
-pm2 start bin/start --node-args="--inspect=3215" --name gate
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/gate
-pm2 start capto -- run
--- a/19
+++ b/19
@ -1,19 +0,0 @@
-#!/bin/bash
-<<<<<<< HEAD
-<<<<<<< HEAD
-cd /usr/share/cybafelo/api-v1.6
-pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6
-cd /usr/share/cybafelo/3d-pong
-pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong
-=======
-cd /usr/share/cybafelo/api-v1
-pm2 start bin/start --node-args="--max-old-space-size=16000 --inspect=3204" --name api-v1
-cd /usr/share/cybafelo/3d-pong
-pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3201" --name 3d-pong
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
-=======
-cd /usr/share/cybafelo/api-v1
-pm2 start bin/start --node-args="--max-old-space-size=16000 --inspect=3204" --name api-v1
-cd /usr/share/cybafelo/3d-pong
-pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3201" --name 3d-pong
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/cybafelo/port
-pm2 start bin/start --node-args="--inspect=3214" --name port
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+#!/bin/bash
+cd /usr/share/cybafelo/r3-api
+pm2 start bin/start --node-args="--inspect=3204" --name "r3-api"
--- a/11
+++ b/11
@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#cd /usr/share/cybafelo/3d-racing-server
-<<<<<<< HEAD
-<<<<<<< HEAD
-#pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server
-=======
-#pm2 start app.js --node-args="--max-old-space-size=16000 --inspect=3202" --name 3d-racing-server
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
-=======
-#pm2 start app.js --node-args="--max-old-space-size=16000 --inspect=3202" --name 3d-racing-server
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
--- a/11
+++ b/11
@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-cd /usr/share/cybafelo/tools
-<<<<<<< HEAD
-<<<<<<< HEAD
-pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools
-=======
-pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3209" --name tools
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
-=======
-pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3209" --name tools
->>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
--- a/ubuntu-logo.png
+++ b/ubuntu-logo.png
--- a/ubuntu-logo.xcf
+++ b/ubuntu-logo.xcf
--- a/ubuntu-logo16.png
+++ b/ubuntu-logo16.png
--- a/ubuntu_logo.png
+++ b/ubuntu_logo.png
--- a/ubuntu_logo16.png
+++ b/ubuntu_logo16.png
--- a/vimrc.local
+++ b/vimrc.local
@ -1,39 +0,0 @@
-nmap <silent> <A-Up> :wincmd k<CR>
-nmap <silent> <A-Down> :wincmd j<CR>
-nmap <silent> <A-Left> :wincmd h<CR>
-nmap <silent> <A-Right> :wincmd l<CR>
-nnoremap <C-W> :call MaximizeToggle()<CR>
-nnoremap <C-W> :call MaximizeToggle()<CR>
-"map <S-Up> <C-w>_
-"map <S-Down> <C-w>=
-"nnoremap <C-W><C-O> :call MaximizeToggle()<CR>
-
-function! MaximizeToggle()
-  if exists("s:maximize_session")
-    exec "source " . s:maximize_session
-    call delete(s:maximize_session)
-    unlet s:maximize_session
-    let &hidden=s:maximize_hidden_save
-    unlet s:maximize_hidden_save
-  else
-    let s:maximize_hidden_save = &hidden
-    let s:maximize_session = tempname()
-    set hidden
-    exec "mksession! " . s:maximize_session
-    only
-  endif
-endfunction
-
-set modeline
-set ls=2
-set statusline="%f%m%r%h%w [%Y] [0x%02.2B]%< %F%=%4v,%4l %3p%% of %L"
-
-set number
-set nowrap
-set history=1000000
-com! FormatJSON %!python -m json.tool
-nmap <F5> dd\|i<C-R>=join([" -- Theunis J. Botha <tj.botha@plista.com>  ", strftime("%a, %d %b %Y %H:%M:%S %z")], "")<CR><CR><Esc>
-imap <F5> <ESC>dd\|i<C-R>=join([" -- Theunis J. Botha <tj.botha@plista.com>  ", strftime("%a, %d %b %Y %H:%M:%S %z")], "")<CR><CR>
-syntax on
-set encoding=utf-8
-set background=dark