aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-12 14:03:24 +0000
committerMichael Scherer <misc@mageia.org>2011-02-12 14:03:24 +0000
commit249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff (patch)
tree62f9f485dcdf4083ba3c7ea815db931e2e862ac9 /modules
parent1a20e21ac312e2d481583b9e35825f928afbbb4a (diff)
downloadpuppet-249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff.tar
puppet-249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff.tar.gz
puppet-249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff.tar.bz2
puppet-249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff.tar.xz
puppet-249fb9ae22a5fc08dd3afe84e4d7557e87b4e6ff.zip
- group logically the 2 parts of the file, scripts at first, websites at
the end
Diffstat (limited to 'modules')
-rw-r--r--modules/blog/manifests/init.pp28
1 files changed, 14 insertions, 14 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index a1a848bc..dc6a2228 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -8,12 +8,6 @@ class blog {
home => "/var/lib/blog",
}
- include apache::mod_php
- include mysql
- apache::vhost_other_app { "blog-test.$domain":
- vhost_file => "blog/blogs_vhosts.conf",
- }
-
package { ['wget','php-mysql']:
ensure => installed
}
@@ -26,18 +20,24 @@ class blog {
mode => 755,
content => template("blog/check_new-blog-post.sh")
}
-
- file { "/var/www/html/blog.$domain":
- ensure => directory,
- owner => blog,
- group => blog,
- mode => 644,
- }
-
+
cron { blog:
user => blog,
minute => '*/15',
command => "/usr/local/bin/check_new-blog-post.sh",
require => File["check_new-blog-post"]
}
+
+ include apache::mod_php
+ include mysql
+ apache::vhost_other_app { "blog-test.$domain":
+ vhost_file => "blog/blogs_vhosts.conf",
+ }
+
+ file { "/var/www/html/blog.$domain":
+ ensure => directory,
+ owner => blog,
+ group => blog,
+ mode => 644,
+ }
}