Merge pull request #192 from coreos-inc/sqlssl

Allow SSL cert for the database to be configured

static/js/core-config-setup.js

@@ -591,13 +591,18 @@ angular.module("core-config-setup", ['angularFileUpload'])
       transclude: false,
       restrict: 'C',
       scope: {
-        'filename': '@filename'
+        'filename': '@filename',
+        'skipCheckFile': '@skipCheckFile',
+        'hasFile': '=hasFile'
       },
       controller: function($scope, $element, Restangular, $upload) {
         $scope.hasFile = false;
 
         $scope.onFileSelect = function(files) {
-          if (files.length < 1) { return; }
+          if (files.length < 1) {
+            $scope.hasFile = false;
+            return;
+          }
 
           $scope.uploadProgress = 0;
           $scope.upload = $upload.upload({
@@ -623,7 +628,7 @@ angular.module("core-config-setup", ['angularFileUpload'])
           });
         };
 
-        if ($scope.filename) {
+        if ($scope.filename && $scope.skipCheckFile != "true") {
           loadStatus($scope.filename);
         }
       }

static/js/pages/setup.js

@@ -96,6 +96,9 @@
     $scope.stepProgress = [];
     $scope.hasSSL = false;
     $scope.hostname = null;
+    $scope.currentState = {
+      'hasDatabaseSSLCert': false
+    };
 
     $scope.$watch('currentStep', function(currentStep) {
       $scope.stepProgress = $scope.getProgress(currentStep);
@@ -268,6 +271,14 @@
         'hostname': window.location.host
       };
 
+      if ($scope.currentState.hasDatabaseSSLCert) {
+        data['config']['DB_CONNECTION_ARGS'] = {
+          'ssl': {
+            'ca': 'conf/stack/database.pem'
+          }
+        };
+      }
+
       var params = {
         'service': 'database'
       };