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
PCoder
61127e56ca
Update virtual_machine_detail.html template
...
To show the Add SSH key button and the modal that pops up after clicking
it.
2019-05-12 19:16:53 +02:00
PCoder
67d789ebdb
Implement save_ssh_key_in_vm_template_task
...
A celery task which first sends a power off signal to the VM with the
given ID and polls until it is powered off. Then, it updates the VM
template with the given ssh keys of the user and resumes it.
User is notified once the VM template has been updated.
2019-05-12 19:13:22 +02:00
PCoder
7e538bf37b
Add ssh_key_added_to_vm.{html,txt} email templates
2019-05-12 19:12:34 +02:00
PCoder
3133bde0e9
Don't set the key in the live template
2019-05-11 09:15:08 +02:00
PCoder
b189371a7b
Call get_all_active_vmids to get the active vmids
2019-05-11 02:38:16 +02:00
PCoder
7f6d4c1c53
Refactor get_all_vmids -> get_all_active_vmids
...
We now get this info from opennebula
2019-05-11 02:23:51 +02:00
PCoder
0b85784fd3
No need to manage ssh keys after VM is created
...
The ssh keys are added at the time the VM is created or later
2019-05-11 01:56:00 +02:00
PCoder
65c9ccb671
Use save_key_in_opennebula_user and save_key_in_vm_template
2019-05-11 01:54:35 +02:00
PCoder
3602bb0eb7
Add save_key_in_vm_template and get_all_vmids methods
2019-05-11 01:46:28 +02:00
PCoder
5146daa680
Use SSH_PUBLIC_KEY within CONTEXT
2019-05-11 00:31:25 +02:00
PCoder
6a1faa52e4
Set user's own ssh keys when creating VM
2019-05-11 00:25:49 +02:00
PCoder
85136d80cc
Pass the opennebula user id as the object id
2019-05-10 23:57:52 +02:00
PCoder
c92b8c6fac
one. is appended by oca
2019-05-10 23:51:05 +02:00
PCoder
1d70563ea2
Save user's key in opennebula
2019-05-10 09:19:42 +02:00
PCoder
cd47af23f1
Update Changelog
2019-05-10 07:22:21 +02:00
PCoder
5c92aa713b
Update cdist version 4.7.0 -> 5.0.1
2019-05-10 07:00:54 +02:00
b8ca7286f2
Add view to check if the vm belongs to a user
2019-05-09 01:34:18 -04:00
PCoder
fa66d48323
Update Changelog for 2.5.9
2019-05-09 00:15:27 +02:00
10be0e472d
Merge branch 'bugfix/6669/opennebula-vm-query-takes-long' into 'master'
...
Bugfix/6669/opennebula vm query takes long
See merge request ungleich-public/dynamicweb!703
2019-05-09 00:09:41 +02:00
bebf1f94d7
Correct spelling mistake
2019-05-09 00:06:57 +02:00
PCoder
d5dc5df1f2
Add doc
2019-05-09 00:06:22 +02:00
PCoder
8afed25d04
Merge branch 'master' into bugfix/6669/opennebula-vm-query-takes-long
2019-05-08 23:58:04 +02:00
9c8bc2e982
Merge branch 'bugfix/increase-configuration-length' into 'master'
...
Increase configuration length in VMDetail to 128 chars
See merge request ungleich-public/dynamicweb!702
2019-05-08 23:52:52 +02:00
PCoder
f0dfcccd96
Increase configuration length in VMDetail to 128 chars
2019-05-08 23:42:03 +02:00
PCoder
927d4a029c
Do not search for VM details like 'ID={vm_id}'
...
Query takes a long time and not ideal
2019-05-08 22:43:26 +02:00
PCoder
f837e2b206
Add deleteuser management command
2019-05-07 06:36:25 +02:00
PCoder
d8b95abb39
Check private key is true
2019-05-06 08:48:26 +02:00
PCoder
729a813804
Flip the order of logging
2019-05-06 08:47:59 +02:00
a63d9098d4
Merge branch 'feature/delete-user' into 'master'
...
Feature/delete user
See merge request ungleich-public/dynamicweb!701
2019-05-06 08:33:43 +02:00
PCoder
3f01145cd1
Add additional None checks
2019-05-06 08:30:50 +02:00
PCoder
0f777e66d8
Add entry to DeletedUser + fix code to delete user from opennebula
2019-05-06 08:08:51 +02:00
PCoder
c40331fcc1
Add deleteduser model
2019-05-06 08:07:26 +02:00
PCoder
ba88bbf6bd
Add migration to change user_id to customuser_id in legacy code
...
Pertains to djangocms_blog
2019-05-06 08:04:57 +02:00
PCoder
5d3f769750
Merge remote-tracking branch 'mainRepo/master' into feature/delete-user
2019-05-06 07:08:10 +02:00
PCoder
6b8ecd7c9b
Merge branch 'remove-maxcdn-dependency'
2019-05-05 21:17:56 +02:00
PCoder
05786418e4
Update Changelog for 2.5.7
2019-05-05 21:16:12 +02:00
5073b35205
Merge branch 'remove-maxcdn-dependency' into 'master'
...
Remove code.jquery.com and maxcdn.bootstrapcdn.com dependencies
See merge request ungleich-public/dynamicweb!700
2019-05-05 21:05:32 +02:00
PCoder
e6ff78b37d
Correct the contents of font-awesome-4.1.0 min css file
2019-05-05 20:49:16 +02:00
