From 3297f4230ce9f53246f447e3a3c2984d51e86f5c Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 1 Jul 2008 12:41:06 -0400 Subject: Minor fixes * We don't want to depend on the "git" module * Technically the conf file needs the code checked out first --- manifests/init.pp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b62ee79..3a149e5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,3 @@ -import "git" - class django::server { package { ["httpd", "Django", "mod_python"]: ensure => installed, @@ -16,15 +14,11 @@ class django::server { group => "root", mode => 0644, source => "puppet:///django/django.conf", - require => [Package["httpd"],Package["mod_python"]], + require => [Package["httpd"],Package["mod_python"], Exec["Checkout django example"]], notify => Service["httpd"], } - git::repo { "django-code-repo": - src => "git://$gitserver/pub/git/sd/intranet/everest_django", - dst => "/usr/local/everest_django", - require => [Package["httpd"], Package["Django"]], + exec { "Checkout django example": + command => "/usr/bin/git clone git://${everestrepo}/pub/git/code/everest_django /usr/local/everest_django", } - - } -- cgit