From: Thierry Parmentelat Date: Fri, 15 Nov 2013 11:22:25 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.3-0~113^2~7^2~7^2~5^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4b6ded2a59de0a500ba0f2f50a06eb1ef1788027;hp=4a860c207455487b27edb31c30f0254732dcb110;p=unfold.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/README b/README index 3a894cc0..3c0f943a 100644 --- a/README +++ b/README @@ -16,6 +16,7 @@ See the devel/ subdir for more devel-oriented doc. * edit myslice/config.py and enter the details of your manifold backend +$ apt-get install python-django-south * init django $ ./manage.py syncdb $ ./manage.py migrate @@ -43,7 +44,7 @@ $ make redo == make redo-static redo-templates * run a local server: -$ manage.py runserver 0.0.0.0:8000 +$ ./manage.py runserver 0.0.0.0:8000 -- or -- my advice: $ devel/server-loop.sh when you just need to hit ^C yourself when your static files need to be refreshed - see below diff --git a/portal/accountview.py b/portal/accountview.py index d4b68f40..d9666cbf 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -161,6 +161,9 @@ def account_process(request): # private_key = k.as_pem() # private_key = ''.join(private_key.split()) # public_key = "ssh-rsa " + public_key + # now we overwrite the config field with keypair + # once there will be user_hrn, we need to keep user_hrn and change only the keypair + # see submit_name section for implementing this keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + '}' # keypair = re.sub("\r", "", keypair) # keypair = re.sub("\n", "\\n", keypair)