summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2008-07-01 12:41:06 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2008-07-01 12:50:12 -0400
commit3297f4230ce9f53246f447e3a3c2984d51e86f5c (patch)
treebcbf44bae47e12d028c870644e9086593213dfba
parent2992df23743bf67229dd8be16218cd6b3de76808 (diff)
downloadpuppet-django-3297f4230ce9f53246f447e3a3c2984d51e86f5c.zip
puppet-django-3297f4230ce9f53246f447e3a3c2984d51e86f5c.tar.gz
puppet-django-3297f4230ce9f53246f447e3a3c2984d51e86f5c.tar.xz
Minor fixes
* We don't want to depend on the "git" module * Technically the conf file needs the code checked out first
-rw-r--r--manifests/init.pp12
1 files 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",
}
-
-
}