Revision 5bc1794f ui/views.py
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