Commit graph

4579 commits

Author SHA1 Message Date
59a78dd8bb Merge branch 'task/5509/add-keys-to-opennebula-user' into 'master'
Save user's key in opennebula

See merge request ungleich-public/dynamicweb!704
2019-06-25 14:00:44 +02:00
PCoder
feeb102f92 Do SSH key validation only if the user doesn't have an existing key and
the user has input some value in the add ssh key field
2019-06-25 03:48:29 +02:00
PCoder
34c917acc2 Add SSH form to hosting VM buy flow also 2019-06-25 03:10:50 +02:00
PCoder
85f7d73442 Code cleanup: Remove ssh_key_added_to_vm email templates 2019-06-25 02:32:19 +02:00
PCoder
6d3b5f40c0 Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user 2019-06-25 02:29:15 +02:00
PCoder
9ee1b7c124 Make public_key form params mandatory only if existing keys do not exist 2019-06-25 02:25:17 +02:00
PCoder
0cf5e541cc Code cleanup: remove VM poweroff/resume methods + styles + html code 2019-06-25 02:24:14 +02:00
PCoder
08608c726f Code cleanup: remove updating ssh keys on live VMs 2019-06-25 02:11:57 +02:00
PCoder
39549d5e36 Close div 2019-06-24 19:07:11 +02:00
PCoder
a330dee9a1 Modify style 2019-06-24 18:58:44 +02:00
PCoder
ba7ff9e409 Adjust textarea styles 2019-06-24 18:39:25 +02:00
PCoder
04f1112b09 Add key in the text area 2019-06-24 18:26:45 +02:00
PCoder
ecc26d14e5 Show previous keys if exist in order confirmation 2019-06-24 17:24:35 +02:00
PCoder
110f29171d Update user ssh key in opennebula 2019-06-24 04:33:48 +02:00
PCoder
87f5bf3dcc Pass UserHostingKeyForm to the context of OrderConfirmationView 2019-06-24 04:32:27 +02:00
PCoder
1e68ecb047 Confirm order button close: Redirect only to url specified 2019-06-24 04:31:29 +02:00
PCoder
108fbb09b0 Add ssh key form to order_detail page
To ask for the SSH key at the time of confirming and placing the order.

The order does not proceed until the user provides a valid ssh key.
2019-06-24 04:29:34 +02:00
PCoder
151983ff59 Update Changelog for 2.5.11 2019-06-11 01:09:45 +02:00
3f8bc1b842 Merge branch 'william' into 'master'
fix translation Learn more -> Lerne mehr

See merge request ungleich-public/dynamicweb!708
2019-06-11 00:58:20 +02:00
e5f317281f fix translation Learn more -> Lerne mehr 2019-06-10 18:25:18 -04:00
cb244e78a1 Merge branch 'feature/reversedns/check-users-vm-against-opennebula' into 'master'
Feature/reversedns/check users vm against opennebula

See merge request ungleich-public/dynamicweb!707
2019-06-10 15:01:46 +02:00
PCoder
1ebfc8b2dc Don't use VirtualMachineSerializer for obtaining users_vms 2019-06-10 14:51:40 +02:00
PCoder
c99e943ebc Use oneadmin_client to update a user's ssh key 2019-06-10 09:23:48 +02:00
PCoder
496178f44c Check if VM belongs to user against opennebula backend 2019-06-08 04:40:16 +02:00
PCoder
63a78a537e Use infoextended for fallback case also 2019-06-08 04:25:55 +02:00
6ac9d2fb1e Merge branch 'william' into 'master'
updated for read vm realm

See merge request ungleich-public/dynamicweb!706
2019-05-16 22:40:18 +02:00
5ad871f124 updated for read vm realm 2019-05-16 16:35:44 -04:00
PCoder
0cada8668a Update Changelog for 2.5.10 2019-05-16 22:10:41 +02:00
c469948901 Merge branch 'william' into 'master'
Add view to check if the vm belongs to a user (for ungleich-cli)

See merge request ungleich-public/dynamicweb!705
2019-05-16 22:01:21 +02:00
a82ecbe4d5 fix typho in check_vm 2019-05-16 13:34:13 -04:00
ce630573e0 Remove print statement & correct code return 2019-05-16 13:33:31 -04:00
PCoder
94d5c34152 [hosting/bill] Skip creating MHB for invoices that have been imported already 2019-05-13 21:15:38 +02:00
69ec7d2b46 reuse of the env variable in the base settings 2019-05-13 03:44:09 -04:00
PCoder
72ea362d01 Remove duplicated blocktrans in txt email template 2019-05-13 08:01:11 +02:00
PCoder
caa01f344f Change poweroff to poweroff_hard
Issue with poweroff:

Executing poweroff not always seems to work. Sometimes, the VM is tries
to SHUTDOWN but times out. poweroff-hard seems to poweroff all the time.
2019-05-13 07:56:46 +02:00
PCoder
9fd396363f Center the add ssh key nicely 2019-05-13 07:13:49 +02:00
5e2e906f48 include pyotp in requeriments 2019-05-12 21:35:28 -04:00
fda5118c39 Added otp verification 2019-05-12 21:34:54 -04:00
1faf46cc1b added validation to heck if the user is the one allowed to access 2019-05-12 21:34:10 -04:00
PCoder
641c556bb6 Simplify code 2019-05-12 21:16:46 +02:00
PCoder
f2af1f8708 Rename button id 2019-05-12 21:15:48 +02:00
PCoder
bbe0017fa0 Add missing return statements for error 2019-05-12 21:15:15 +02:00
PCoder
219bfbda12 Use the correct email template
For notifying the user about ssh key was successfully added
2019-05-12 20:13:54 +02:00
PCoder
a44d50dd69 Fix wrong comparing of public_key object with a string value 2019-05-12 19:56:14 +02:00
PCoder
e7c334924d Make update_type a parameter with 1 as default
0: Replace the template
1: Merge the new template
2019-05-12 19:55:24 +02:00
PCoder
d38edb0dfa Add url for AddSshKeyToVMView 2019-05-12 19:22:10 +02:00
PCoder
69049a9321 Add poweroff and resume methods 2019-05-12 19:21:52 +02:00
PCoder
09ab9a714d Add AddSshKeyToVMView 2019-05-12 19:21:19 +02:00
PCoder
0104a804c2 Do not allow comma in SSH key name 2019-05-12 19:20:35 +02:00
PCoder
c9c91b1ecb JS code to handle the add ssh key functionality 2019-05-12 19:19:40 +02:00