Updating file permissions, adding contributors file.

CONTRIBUTORS

@@ -0,0 +1,11 @@
+======================
+theTeam, London Bridge
+======================
+
+Darian Moody <mail@djm.org.uk>
+Alfredo Aguirre <alfredoaguirre@theteam.co.uk>
+
+Patches/Forks
+-------------
+
+Nobody yet, be the first?

modules/djangoapp/manifests/instance.pp

@@ -37,32 +37,45 @@
 
         file { $client_path:
             ensure => directory,
-            owner => $owner,
-            group => $group,
-            mode => 777,
+            owner  => $owner,
+            group  => $group,
+            mode   => 775,
         }
     }
 
     if !defined(File[$project_path]) {
 
         file { $project_path:
-            ensure => directory,
-            owner => $owner,
-            group => $group,
-            mode => 777,
+            ensure  => directory,
+            owner   => $owner,
+            group   => $group,
+            mode    => 775,
+            require => File[$client_path],
         }
 
         exec { "source-checkout":
-            unless => "test -d $src_path",
-            path => "/usr/bin",
+            unless  => "test -d $src_path",
+            path   => "/usr/local/bin:/usr/bin:/bin",
             user => "deployer",
             group => $group,
             command => "git clone $git_checkout_url $src_path",
             require => [
                         Package["git-core"],
                         File["ssh-known-hosts"],
                         File["ssh-public-key"],
-                        File["ssh-private-key"]
+                        File["ssh-private-key"],
+                        File[$project_path],
+                       ],
+        }
+
+        exec { "setup-virtualenv":
+            unless  => "test -d $venv_path",
+            path    => "/usr/local/bin:/usr/bin:/bin",
+            user    => "deployer",
+            group   => $group,
+            command => "virtualenv $venv_path",
+            require => [
+                        Exec["source-checkout"],
                        ],
         }
     }
@@ -95,10 +108,4 @@
         db_user => $full_project_name,
         db_pass => $full_project_name,
     }
-
-    # Everything is in place, deploy!
-    djangoapp::deploy { $full_project_name:
-        project_path => $project_path,
-        git_checkout_url => $git_checkout_url,
-    }
 }

modules/python2/manifests/init.pp

@@ -1,20 +1,28 @@
 class python2 {
-  $packages = ["build-essential", 
+    $packages = ["build-essential", 
                "python", 
                "python-dev", 
                "python-setuptools",
                "python-mysqldb",
                "python-imaging",
                "python-memcache"]
 
-  package {
-    $packages: ensure => installed;
-  }
+    package {
+        $packages: ensure => installed;
+    }
 
-  exec { "easy_install pip":
-      path => "/usr/local/bin:/usr/bin:/bin",
-      refreshonly => true,
-      require => Package["python-setuptools"],
-      subscribe => Package["python-setuptools"],
-  }
+    exec { "install-pip":
+        path        => "/usr/local/bin:/usr/bin:/bin",
+        refreshonly => true,
+        command     => "easy_install pip",
+        require     => Package["python-setuptools"],
+        subscribe   => Package["python-setuptools"],
+    }
+
+    exec { "install-virtualenv":
+        path        => "/usr/local/bin:/usr/bin:/bin",
+        refreshonly => true,
+        command     => "pip install virtualenv",
+        require     => Exec["install-pip"],
+    }
 }