Merge pull request #252 from CloudBoost/staging

Staging
CloudBoost · Sep 20, 2017 · 6563785 · 6563785
2 parents 0242a74 + 80b2e5b
commit 6563785
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,7 @@ after_success:
     docker push cloudboost/cloudboost:staging;
     git clone https://github.com/CloudBoost/kube-cred.git;
     cd kube-cred;
-    openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
+    openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
     mkdir ~/.kube;
     mv config ~/.kube/;
     kubectl rolling-update cloudboost-engine-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;

diff --git a/page-templates/user/login.ejs b/page-templates/user/login.ejs
@@ -4,7 +4,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-    <link rel="stylesheet" href="/css/login.css">   
+    <link rel="stylesheet" href="assets/css/login.css">   
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
     <script src="https://cloudboost.io/js-sdk/cloudboost.js"></script>
@@ -32,7 +32,7 @@
                             </div>
                         <%}else{%>
                             <div style="width:50px;height:50px;border-radius: 10px;overflow: hidden;">
-                                <img src="/images/CbLogoIcon.png" style="width:50px;height:50px;">
+                                <img src="assets/images/CbLogoIcon.png" style="width:50px;height:50px;">
                             </div>
                         <%}%>    
                     </div>
@@ -243,7 +243,7 @@
                             </div>
                         <%}else{%>
                             <div style="width:50px;height:50px;border-radius: 10px;overflow: hidden;">
-                                <img src="/images/CbLogoIcon.png" style="width:50px;height:50px;">
+                                <img src="assets/images/CbLogoIcon.png" style="width:50px;height:50px;">
                             </div>
                         <%}%>    
                     </div>
@@ -337,7 +337,7 @@
 
 </body>
 <script>  
-    var serverURL="https://api.cloudboost.io";  
+    var serverURL="https://cloudboost.io/engine/";  
     var __isDevelopment = false;
 
     if(window.location.host.indexOf('localhost') > -1){

diff --git a/page-templates/user/password-reset.ejs b/page-templates/user/password-reset.ejs
@@ -5,7 +5,7 @@
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-    <link rel="stylesheet" href="/css/login.css">   
+    <link rel="stylesheet" href="assets/css/login.css">   
 
     <!--IMPORTANT:Bind data from server to javascript variables-->
     <script type="text/javascript">  
@@ -37,7 +37,7 @@
                             </div>
                         <%}else{%>
                             <div style="width:50px;height:50px;border-radius: 10px;overflow: hidden;">
-                                <img src="/images/CbLogoIcon.png" style="width:50px;height:50px;">
+                                <img src="assets/images/CbLogoIcon.png" style="width:50px;height:50px;">
                             </div>
                         <%}%>    
                     </div>
@@ -212,7 +212,7 @@
 <script src="https://cloudboost.io/js-sdk/cloudboost.js"></script>
 
 <script>  
-    var serverURL="https://api.cloudboost.io";  
+    var serverURL="https://cloudboost.io/engine/";  
     var __isDevelopment = false;
 
     if(window.location.host.indexOf('localhost') > -1){

diff --git a/page-templates/user/signup-activate.ejs b/page-templates/user/signup-activate.ejs
@@ -5,7 +5,7 @@
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-    <link rel="stylesheet" href="/css/login.css">       
+    <link rel="stylesheet" href="assets/css/login.css">       
 
 </head>
 <body>
@@ -30,7 +30,7 @@
                             </div>
                         <%}else{%>
                             <div style="width:50px;height:50px;border-radius: 10px;overflow: hidden;">
-                                <img src="/images/CbLogoIcon.png" style="width:50px;height:50px;">
+                                <img src="assets/images/CbLogoIcon.png" style="width:50px;height:50px;">
                             </div>
                         <%}%>    
                     </div>
@@ -102,7 +102,7 @@
 <script src="https://cloudboost.io/js-sdk/cloudboost.js"></script>
 
 <script>  
-    var serverURL="https://api.cloudboost.io";  
+    var serverURL="https://cloudboost.io/engine/";  
     var __isDevelopment = false;
 
     if(window.location.host.indexOf('localhost') > -1){

diff --git a/server.js b/server.js
@@ -73,7 +73,9 @@ global.app = global.express();
 
 //For pages in cloudboost
 global.app.set('view engine', 'ejs');
-global.app.use(global.express.static(path.join(__dirname, 'page-templates/assets')));
+global.app.use('*/assets',global.express.static(path.join(__dirname, 'page-templates/assets')));
+global.app.use(bodyParser.json({limit: '5mb'}));
+global.app.use(bodyParser.urlencoded({limit: '5mb'}));
 
 var http = null;
 var https = null;
@@ -505,7 +507,7 @@ function addConnections() {
 function setUpAnalytics() {
     try {
         console.log("Setting up Analytics...");
-        if (process.env["CLOUDBOOST_ANALYTICS_SERVICE_HOST"]) {
+        if (process.env["CLOUDBOOST_ANALYTICS_SERVICE_HOST"] || process.env["CLOUDBOOST_ANALYTICS_STAGING_SERVICE_HOST"]) {
             //this is running on Kubernetes
             console.log("CloudBoost Analytics is running on Kubernetes");