etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7020: Enabling VPN will allow you to see the IP and pre-shared key you are suppose to use to connect to the vpn itself. 

status 7020: resolved fixed
This commit is contained in:
will 2010-11-05 12:52:43 -07:00
parent 1fe8ae4819
commit ce1f4fa799
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/css/main.css
View File

@ -2908,8 +2908,9 @@ a:hover.search_button {
}
.info_detailbox.defaultbox {
background:FFF repeat-x top left;
color:#a90000;
background:#eaf2f6 repeat-x top left;
color:#333;
margin-top:10px;
}

6
ui/jsp/ipaddress.jsp
View File

@ -284,6 +284,12 @@
</div>
</div>
<div id="tab_container" style="display:none">
<div id="vpn_help" class="info_detailbox defaultbox" style="display:none;">
<p>
Your VPN access is currently enabled and can be accessed via the IP : <b><span id="vpn_ip"></span></b><br/>
Your IPSec pre-shared key is : <b><span id="vpn_key"></span></b><br/>
</p>
</div>
<div class="grid_container">
<div class="grid_header">
<div id="grid_header_title" class="grid_header_title">VPN Users</div>

5
ui/scripts/cloud.core.ipaddress.js
View File

@ -388,6 +388,8 @@ function ipJsonToVPNTab() {
success: function(json) {
var items = json.listremoteaccessvpnsresponse.remoteaccessvpn;
if (items != null && items.length > 0) {
$thisTab.find("#vpn_key").text(items[0].presharedkey);
$thisTab.find("#vpn_ip").text(items[0].publicip);
showVpnUsers();
} else {
showEnableVPNDialog($thisTab);
@ -439,6 +441,7 @@ function showVpnUsers() {
if (result.jobstatus == 1) { // Succeeded
$thisDialog.dialog("close");
$vpnTab.find("#vpn_help").hide();
$vpnTab.find("#enable_vpn_link").unbind("click").bind("click", function(event) {
showEnableVPNDialog($vpnTab);
});
@ -552,6 +555,8 @@ function showVpnUsers() {
return false;
});
$vpnTab.find("#vpn_help").show();
// List users
$.ajax({
data: createURL("command=listVpnUsers&account="+ipObj.account+"&domainid="+ipObj.domainid),