Merge lp:~liuyq0307/lava-deployment-tool/modify-login-url into lp:~linaro-validation/lava-deployment-tool/trunk

[Yongqin Liu]

modify the LOGIN_URL in settings.conf to make it redirect to the login page correctly
when click [API->Authentication Tokens] menu.

[Zygmunt Krynicki (zyga)]

Looks good

+-e bzr+lp:lava-android-test#egg=lava-android-test

Is this something we need as well?

review: Approve

[Yongqin Liu (liuyq0307)]

> Looks good
>
> +-e bzr+lp:lava-android-test#egg=lava-android-test
>
> Is this something we need as well?

Sorry, this is not intended. only the lava-deployment-tool file is needed.
If possible, please ignore the requirements-trunk.txt file when merge.
Otherwise, I will update & merge this branch tomorrow.

[lp:~liuyq0307/lava-deployment-tool/modify-login-url]

181. By Yongqin Liu on 2012-06-05

revert requirements-trunk.txt to not include the lava-android-text

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2012-06-04 09:56:48 +0000
+++ lava-deployment-tool	2012-06-05 01:28:20 +0000
@@ -1852,6 +1852,7 @@
         sudo rm /etc/apache2/conf.d/${LAVA_INSTANCE}.conf
         sed -i "s/    \"MEDIA_URL\": \"\/${LAVA_INSTANCE}-media\/\",/    \"MEDIA_URL\": \"\/media\/\",/" ${settings_file} 
         sed -i "s/    \"STATIC_URL\": \"\/${LAVA_INSTANCE}-static\/\",/    \"STATIC_URL\": \"\/static\/\",/" ${settings_file}
+        sed -i "s/    \"LOGIN_URL\": \"\/${LAVA_INSTANCE}\/accounts\/login\/\",/    \"LOGIN_URL\": \"\/accounts\/login\/\",/" ${settings_file}
         sed -i "s/    \"LOGIN_REDIRECT_URL\": \"\/${LAVA_INSTANCE}\",/    \"LOGIN_REDIRECT_URL\": \"\/\",/" ${settings_file}
         touch ${reload_file}
         sudo a2ensite $LAVA_INSTANCE.conf
@@ -1872,11 +1873,12 @@
         sudo ln -s ${single_conf} /etc/apache2/conf.d/${LAVA_INSTANCE}.conf
         sed -i "s/    \"MEDIA_URL\": \"\/media\/\",/    \"MEDIA_URL\": \"\/${LAVA_INSTANCE}-media\/\"\,/" ${settings_file} 
         sed -i "s/    \"STATIC_URL\": \"\/static\/\",/    \"STATIC_URL\": \"\/${LAVA_INSTANCE}-static\/\",/" ${settings_file}
+        sed -i "s/    \"LOGIN_URL\": \"\/accounts\/login\/\",/    \"LOGIN_URL\": \"\/${LAVA_INSTANCE}\/accounts\/login\/\",/" ${settings_file}
         sed -i "s/    \"LOGIN_REDIRECT_URL\": \"\/\",/    \"LOGIN_REDIRECT_URL\": \"\/${LAVA_INSTANCE}\",/" ${settings_file}
         touch ${reload_file}
         return 0
     else
-        echo 'target must be specified with "site" or "singleip"'
+        echo 'target must be specified with "vhost" or "location"'
         return 1
     fi
 }