From 3c64e4008169e3b75c32153ce5b495b8bc71f5a5 Mon Sep 17 00:00:00 2001
From: -=yb4f310 <theunis.botha1@gmail.com>
Date: Mon, 14 May 2018 10:20:12 +0200
Subject: [PATCH] nice config

---
 config.js                     | 24 +++++++++++++-----------
 hosts                         |  3 +++
 nginx/sites-available/r3.conf |  7 ++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/config.js b/config.js
index 3b5a406..b8c6500 100644
--- a/config.js
+++ b/config.js
@@ -1,19 +1,21 @@
 var environment = {
     path : '/usr/share/cybafelo',
-    protocol : 'http',
-    environment : 'tj',
-    domain : 'cybafelo.local',
+    protocol : 'https',
+    localEnvironment : 'dev',
+    localDomain : 'cybafelo.local',
+    remoteEnvironment : 'live',
     remoteDomain : 'cybafelo.com'
 };
 
-var protocol        = environment.protocol;
-var user            = environment.environment;
-var domain          = environment.domain;
-var remoteDomain    = environment.remoteDomain;
+var protocol        	= environment.protocol;
+var localEnvironment    = environment.localEnvironment;
+var localDomain         = environment.localDomain;
+var remoteEnvironment   = environment.remoteEnvironment;
+var remoteDomain    	= environment.remoteDomain;
 
 var config = {
     editor: {
-        url: protocol + '://' + user + '-r3-3ditor.' + domain,
+        url: protocol + '://' + localEnvironment + '-r3-3ditor.' + localDomain,
         default: {
             platform: 'cybafelo',
             account: 'root',
@@ -22,13 +24,13 @@ var config = {
         }
     },
     api: {
-        url: protocol + '://' + user + '-r3-api.' + domain,
-        remoteUrl: protocol + '://' + user + '-r3-api.' + remoteDomain,
+        url: protocol + '://' + localEnvironment + '-r3-api.' + localDomain,
+        remoteUrl: protocol + '://' + remoteEnvironment + '-r3-api.' + remoteDomain,
 		uploadPath: '/uploads',
 		clientPassword: '"kent sent me" motherfucker!'
     },
     portal: {
-        url: protocol + '://' + user + '-r3-portal.' + domain
+        url: protocol + '://' + localEnvironment + '-r3-portal.' + localDomain
     },
     db: {},
     environment : environment
diff --git a/hosts b/hosts
index 04900d0..440c3f7 100644
--- a/hosts
+++ b/hosts
@@ -7,6 +7,9 @@
 
 # i use the dotdee utility to update hosts from a hosts.d file with a symbolic link from /etc/dotdee/etc/hosts.d/60-r3-hosts to this one
 
+# the app has to have a 1 to 1 mapping to the folder name which you cloned from the repo:
+
 127.0.1.1   dev-r3-3ditor.cybafelo.local
 127.0.1.1   dev-r3-portal.cybafelo.local
 127.0.1.1   dev-r3-api.cybafelo.local
+127.0.1.1   dev-ar.cybafelo.local
diff --git a/nginx/sites-available/r3.conf b/nginx/sites-available/r3.conf
index 79f4399..473cd4d 100644
--- a/nginx/sites-available/r3.conf
+++ b/nginx/sites-available/r3.conf
@@ -10,10 +10,15 @@ upstream php {
 # Now define our sites
 server {
 
-	#listen 443 ssl default_server;
+	listen 443 ssl default_server;
     listen 80 default_server;
     listen [::]:80 default_server ipv6only=on;
 
+    ssl_certificate     /usr/share/cybafelo/config/dev.cybafelo.local.crt;
+    ssl_certificate_key /usr/share/cybafelo/config/dev.cybafelo.local.key;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers         HIGH:!aNULL:!MD5;
+
 	client_max_body_size 20M;
 
     server_name ~^(?<environment>.*?)-(?<app>.*?)\.(?<host_domain>.*);