aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-09 11:15:13 +0000
committerMichael Scherer <misc@mageia.org>2011-01-09 11:15:13 +0000
commit12e4ffac877d70561885d4b02f33544a9b00906f (patch)
tree8e411dafd72085d9f714b1ddb79ca0a01050cacb
parent821be9435faf182d011931e6dfe6f30ba014fa23 (diff)
downloadpuppet-12e4ffac877d70561885d4b02f33544a9b00906f.tar
puppet-12e4ffac877d70561885d4b02f33544a9b00906f.tar.gz
puppet-12e4ffac877d70561885d4b02f33544a9b00906f.tar.bz2
puppet-12e4ffac877d70561885d4b02f33544a9b00906f.tar.xz
puppet-12e4ffac877d70561885d4b02f33544a9b00906f.zip
use mysql module, reindent the file to be consistent with space and more compact
-rw-r--r--modules/blog/manifests/init.pp53
1 files changed, 23 insertions, 30 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 05a8bae1..2ada31ca 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -1,41 +1,34 @@
#TODO:
# - add the creation of the user 'blog' in puppet
class blog {
- package { 'mysql':
- ensure => installed
- }
-
- package { 'php-mysql':
- ensure => installed
- }
-
include apache::mod_php
+ include mysql
- package { 'wget':
- ensure => installed
- }
+ package { ['wget','php-mysql']:
+ ensure => installed
+ }
file { "check_new-blog-post":
- path => "/usr/local/bin/check_new-blog-post.sh",
- ensure => present,
- owner => blog,
- group => blog,
- mode => 755,
- content => template("blog/check_new-blog-post.sh")
- }
+ path => "/usr/local/bin/check_new-blog-post.sh",
+ ensure => present,
+ owner => blog,
+ group => blog,
+ mode => 755,
+ content => template("blog/check_new-blog-post.sh")
+ }
- file { "/var/lib/blog":
- ensure => directory,
- owner => blog,
- group => blog,
- mode => 644,
- }
+ file { "/var/lib/blog":
+ 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"]
- }
+ cron { blog:
+ user => blog,
+ minute => '*/15',
+ command => "/usr/local/bin/check_new-blog-post.sh",
+ require => File["check_new-blog-post"]
+ }
}