Updated version control handling, updated checkout code, added deploy…

…ment + sshd modules.

.gitignore

@@ -1,3 +1,6 @@
 .vagrant
 config.yml
 manifests/*.pp
+modules/deployment/files/ssh/id_rsa
+modules/deployment/files/ssh/id_rsa.pub
+modules/deployment/files/ssh/authorized_keys

modules/apache2/manifests/init.pp

@@ -4,7 +4,7 @@
 
     package { $packages: ensure => installed}
 
-    service { apache2:
+    service { "apache2":
         ensure => running,
         enable => true,
         hasrestart => true,

modules/aptitude/manifests/init.pp

@@ -1,12 +1,14 @@
 class aptitude {
-      exec { "aptitude":
+
+    exec { "aptitude-update":
         command     => "/usr/bin/aptitude update",
-        refreshonly => true;
-      }
-      cron { "aptitude":
+        refreshonly => false;
+    }
+
+    cron { "aptitude-update":
         command => "/usr/bin/aptitude update",
         user    => root,
         hour    => 23,
         minute  => 59;
-      }
-}
+    }
+}

modules/deployment/manifests/init.pp

@@ -0,0 +1,47 @@
+class deployment {
+
+    $deploy_user = "deployer"
+    $deploy_group = "www-data"
+
+    user {$deploy_user:
+        name       => $deploy_user,
+        gid        =>  $deploy_group,
+        home       => "/home/$deploy_user",
+        shell      => "/bin/bash",
+        managehome => true,
+        ensure     => "present",
+    }
+
+    file {"/home/$deploy_user/.ssh":
+        ensure  => directory,
+        owner   => $deploy_user,
+        group   => $deploy_group,
+        mode    => 700,
+        require => User[$deploy_user],
+    }
+
+    file {"/home/$deploy_user/.ssh/authorized_keys":
+        ensure => present,
+        owner  => $deploy_user,
+        group  => $deploy_group,
+        mode   => 640,
+        source => "puppet:///modules/deployment/ssh/authorized_keys",
+    }
+
+    file {"/home/$deploy_user/.ssh/id_rsa":
+        ensure => present,
+        owner  => $deploy_user,
+        group  => $deploy_group,
+        mode   => 640,
+        source => "puppet:///modules/deployment/ssh/id_rsa",
+    }
+
+    file {"/home/$deploy_user/.ssh/id_rsa.pub":
+        ensure => present,
+        owner  => $deploy_user,
+        group  => $deploy_group,
+        mode   => 640,
+        source => "puppet:///modules/deployment/ssh/id_rsa.pub",
+    }
+
+}

modules/djangoapp/manifests/instance.pp

@@ -10,6 +10,8 @@
                     $requirements=false) {
 
     include aptitude
+    include deployment
+    include sshd
     include iptables
     include logrotate
     include denyhosts
@@ -29,15 +31,15 @@
     $venv_path = "${project_path}venv/"
     $src_path = "${project_path}src/"
 
-
     # Create client and project paths if they
     # do not currently exist.
     if !defined(File[$client_path]) {
 
         file { $client_path:
             ensure => directory,
             owner => $owner,
-            group => $group
+            group => $group,
+            mode => 777,
         }
     }
 
@@ -47,23 +49,16 @@
             ensure => directory,
             owner => $owner,
             group => $group,
-        }
-
-        file { $src_path:
-            ensure => directory,
-            owner => $owner,
-            group => $group,
-            require => File[$project_path],
+            mode => 777,
         }
 
         exec { "source-checkout":
             unless => "test -d $src_path",
             path => "/usr/bin",
-            command => "git clone $git_checkout_url $src_path",
-            user => $owner,
+            user => "deployer",
             group => $group,
-            require => [File[$src_path],
-                        Package["git-core"]],
+            command => "git clone $git_checkout_url $src_path",
+            require => [Package["git-core"]],
         }
     }
 

modules/sshd/manifests/init.pp

@@ -0,0 +1,7 @@
+class sshd {
+
+    package { "openssh-server": 
+        ensure => installed,
+    }
+
+}

modules/version_control/manifests/init.pp

@@ -0,0 +1,6 @@
+class version_control {
+    include version_control::git
+    include version_control::subversion
+    include version_control::mercurial
+    include version_control::bazaar
+}

modules/version_control/manifests/subversion.pp

@@ -1,5 +1,7 @@
 class version_control::subversion {
 
-    package { "subversion": ensure => installed }
+    package { "subversion": 
+               ensure => installed,
+               require => Exec["aptitude-update"]}
 
 }