From bd99cf011c49ed2842449a7ba285b86842c56adb Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 17 Mar 2012 12:03:47 +0000 Subject: small cleanup regarding variable scoping, and fix the comment to indicate what does the user is meant to do --- modules/blog/manifests/init.pp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'modules/blog/manifests/init.pp') diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 84cf94d4..b6adecf2 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -1,15 +1,14 @@ class blog { - class base { - $blog_location = "/var/www/vhosts/blog.$domain" - $blog_domain = "blog.$domain" - $blog_db_backupdir = "/var/lib/backups/blog_db" - $blog_files_backupdir = "/var/lib/backups/blog_files" + $blog_domain = "blog.$::domain" + $blog_location = "/var/www/vhosts/$blog_domain" + $blog_db_backupdir = "/var/lib/backups/blog_db" + $blog_files_backupdir = "/var/lib/backups/blog_files" - user { "blog": - groups => apache, - comment => "Mageia Blog", - home => "/var/lib/blog", + user { 'blog': + groups => apache, + comment => 'User to run script checking for new blog post', + home => '/var/lib/blog', } } @@ -44,11 +43,10 @@ class blog { content => template('blog/blogs_vhosts.conf'), } - file { "$blog_location": + file { $blog_location: ensure => directory, owner => apache, group => apache, - mode => 644, } } -- cgit v1.2.1