Revision 5bc1794f
| b/ui/static/synnefo.js | ||
|---|---|---|
| 1237 | 1237 |
return false; |
| 1238 | 1238 |
} |
| 1239 | 1239 |
|
| 1240 |
var username_meta_key = 'User'; |
|
| 1241 |
|
|
| 1240 | 1242 |
var serverID = serverIDs.pop(); |
| 1241 | 1243 |
var machine = get_machine(serverID); |
| 1242 | 1244 |
var serverName = machine.name; |
| ... | ... | |
| 1249 | 1251 |
var os = os_icon(machine.metadata); |
| 1250 | 1252 |
} catch(err) { var os = 'undefined'; }
|
| 1251 | 1253 |
|
| 1254 |
var username = ""; |
|
| 1255 |
try {
|
|
| 1256 |
username = machine.metadata.values[username_meta_key]; |
|
| 1257 |
} catch(err){ username = undefined}
|
|
| 1258 |
|
|
| 1252 | 1259 |
var params_url = '?ip_address=' + serverIP + '&os=' + os + "&host_os=" + $.client.os + "&srv=" + serverID; |
| 1260 |
|
|
| 1261 |
if (username) {
|
|
| 1262 |
params_url += "&username=" + username; |
|
| 1263 |
} |
|
| 1253 | 1264 |
|
| 1254 | 1265 |
if ($.client.os == "Windows" && os == "windows") {
|
| 1255 | 1266 |
window.open('machines/connect' + params_url + "&rdp=1");
|
| b/ui/views.py | ||
|---|---|---|
| 127 | 127 |
|
| 128 | 128 |
def machines_connect(request): |
| 129 | 129 |
ip_address = request.GET.get('ip_address','')
|
| 130 |
operating_system = request.GET.get('os','')
|
|
| 130 |
operating_system = metadata_os = request.GET.get('os','')
|
|
| 131 | 131 |
server_id = request.GET.get('srv', 0)
|
| 132 | 132 |
host_os = request.GET.get('host_os','Linux').lower()
|
| 133 |
username = request.GET.get('username', None)
|
|
| 133 | 134 |
|
| 134 | 135 |
if operating_system != "windows": |
| 135 | 136 |
operating_system = "linux" |
| ... | ... | |
| 154 | 155 |
link_url = "%s?ip_address=%s&os=%s&rdp=1&srv=%d" % (reverse("machines-connect"), ip_address, operating_system,
|
| 155 | 156 |
int(server_id)) |
| 156 | 157 |
|
| 158 |
user = username |
|
| 159 |
if not user: |
|
| 160 |
user = "root" |
|
| 161 |
if metadata_os.lower() in ['ubuntu', 'kubuntu', 'fedora']: |
|
| 162 |
user = "user" |
|
| 163 |
|
|
| 157 | 164 |
if (operating_system != "windows"): |
| 158 |
link_title = "ssh root@%s" % ip_address
|
|
| 165 |
link_title = "ssh %s@%s" % (user, ip_address)
|
|
| 159 | 166 |
link_url = None |
| 160 | 167 |
|
| 161 | 168 |
if host_os == "windows": |
Also available in: Unified diff