Merged master.

make/harbor.cfg

@@ -9,7 +9,11 @@ hostname = reg.mydomain.com
 ui_url_protocol = http
 
 #Email account settings for sending out password resetting emails.
-email_identity = Mail Config
+
+#Email server uses the given username and password to authenticate on TLS connections to host and act as identity.
+#Identity left blank to act as username.
+email_identity = 
+
 email_server = smtp.mydomain.com
 email_server_port = 25
 email_username = sample_admin@mydomain.com

src/ui/static/resources/js/components/replication/create-policy.directive.js

@@ -325,7 +325,12 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingAvailable = true;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
+      
       vm.pingTIP = false;
     }
   }

src/ui/static/resources/js/components/sign-in/sign-in.directive.js

@@ -69,9 +69,11 @@
     
     function signedInFailed(data, status) {
       vm.signInTIP = false;
+      vm.hasError = true;
       if(status === 401) {
-        vm.hasError = true;
         vm.errorMessage = 'username_or_password_is_incorrect';
+      }else {
+        vm.errorMessage = 'failed_to_sign_in';        
       }
       console.log('Failed to sign in:' + data + ', status:' + status);     
     }

src/ui/static/resources/js/components/system-management/create-destination.directive.js

@@ -163,7 +163,11 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingTIP = false;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
     }
   }
   

src/ui/static/resources/js/layout/forgot-password/forgot-password.controller.js

@@ -85,11 +85,10 @@
       vm.hasError = true;
       vm.errorMessage = data;
       
-      if(status === 500) {
+      $scope.$emit('modalTitle', $filter('tr')('error'));
-        $scope.$emit('modalTitle', $filter('tr')('error'));
+      $scope.$emit('modalMessage', $filter('tr')('failed_to_send_email'));        
-        $scope.$emit('modalMessage', $filter('tr')('failed_to_send_email'));        
+      $scope.$emit('raiseError', true);
-        $scope.$emit('raiseError', true);
+      
-      }
       console.log('Failed to send mail:' + data);
     }
     

tools/ova/script/common.sh

@@ -39,7 +39,7 @@ function gc {
 
 #Add rules to iptables
 function addIptableRules {
-	iptables -A INPUT -p tcp --dport 5480 -j ACCEPT
+	iptables -A INPUT -p tcp --dport 5480 -j ACCEPT -w || true
 	#iptables -A INPUT -p tcp --dport 5488 -j ACCEPT
 	#iptables -A INPUT -p tcp --dport 5489 -j ACCEPT
 }

tools/ova/script/firstboot.sh

@@ -19,7 +19,7 @@ fi
 #configure SSH
 configSSH
 
-#echo "Adding rules to iptables..."
+echo "Adding rules to iptables..."
 addIptableRules
 
 echo "Installing docker compose..."

tools/ova/script/subsequentboot.sh

@@ -10,7 +10,7 @@ source $base_dir/common.sh
 #configure SSH
 configSSH
 
-#echo "Adding rules to iptables..."
+echo "Adding rules to iptables..."
 addIptableRules
 
 #Stop Harbor