Merge lp:~brunogirin/charms/precise/python-django/username-password into lp:~charmers/charms/precise/python-django/trunk

[Bruno Girin]

Added support for user name and password in the VCS repo to support repositories like the github private repositories. This implementation only works with URLs of the form protocol://domain/file and stores user name and password in the ~/.netrc file with 600 permissions.

[Brandon Holtsclaw (imbrandon)]

Looks good to me, merging.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-01-28 20:07:29 +0000
+++ config.yaml	2013-01-28 20:07:29 +0000
@@ -8,6 +8,14 @@
         type: string
         default: ""
         description: The vcs url to checkout.
+    repos_username:
+        type: string
+        default: ""
+        description: The vcs user name.
+    repos_password:
+        type: string
+        default: ""
+        description: The vcs password.
     extra_deb_pkgs:
         type: string
         default: ""

=== modified file 'hooks/install'
--- hooks/install	2012-07-06 16:02:20 +0000
+++ hooks/install	2013-01-28 20:07:29 +0000
@@ -4,12 +4,29 @@
 UNIT_NAME=`echo $JUJU_UNIT_NAME | cut -d/ -f1`
 VCS=$(config-get vcs)
 REPOS_URL=$(config-get repos_url)
+REPOS_USERNAME=$(config-get repos_username)
+REPOS_PASSWORD=$(config-get repos_password)
 EXTRA_DEB_PKGS=$(config-get extra_deb_pkgs)
 REQUIREMENTS=$(config-get requirements)
 
 
 juju-log "django: Repos with $VCS and url: $REPOS_URL"
 
+if [ -n "$REPOS_USERNAME" ]; then
+    if [[ "$REPOS_URL" =~ .*://([^/]+)/.* ]]; then
+        REPOS_DOMAIN=${BASH_REMATCH[1]}
+        cat >> ~/.netrc << EOF
+machine ${REPOS_DOMAIN}
+    login ${REPOS_USERNAME}
+    password ${REPOS_PASSWORD}
+
+EOF
+        chmod 600 ~/.netrc
+    else
+        juju-log "Cannot retrieve domain name from URL $REPOS_URL"
+    fi
+fi
+
 apt-get install -y python-django python-imaging python-docutils python-psycopg2 python-pip python-jinja2 mercurial git-core subversion bzr postgresql-client $EXTRA_DEB_PKGS