Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-28 21:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Merged master.

Browse Source
This commit is contained in:
kunw 2016-11-28 12:16:37 +08:00
commit 92a37083d6
8 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/harbor.cfg
View File

@ -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

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

@ -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;
}
}

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

@ -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);
}

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

@ -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);
}
}

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

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

2
tools/ova/script/common.sh
View File

@ -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
}

2
tools/ova/script/firstboot.sh
View File

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

2
tools/ova/script/subsequentboot.sh
View File

@ -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