From fab910c7f712f878c10d121cef3e0452e2b51709 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Mon, 19 Oct 2015 22:21:47 +0300 Subject: lint fixes for blog --- modules/blog/manifests/init.pp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'modules/blog/manifests/init.pp') diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index e0f817dd..08d86d0b 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -1,9 +1,9 @@ class blog { class base { $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" + $blog_location = "/var/www/vhosts/${blog_domain}" + $blog_db_backupdir = '/var/lib/backups/blog_db' + $blog_files_backupdir = '/var/lib/backups/blog_files' $blog_newpost_email_to = 'i18n-reports@ml.mageia.org' $blog_newpost_email_from = 'Mageia Blog bot ' @@ -13,7 +13,7 @@ class blog { home => '/var/lib/blog', } } - + class files_bots inherits base { package { ['php-mysql', 'php-ldap', @@ -32,22 +32,22 @@ class blog { include apache::mod::php - apache::vhost::base { "$blog_domain": + apache::vhost::base { "${blog_domain}": location => $blog_location, - content => template('blog/blogs_vhosts.conf'), + content => template('blog/blogs_vhosts.conf'), } - apache::vhost::base { "ssl_$blog_domain": - use_ssl => true, - vhost => $blog_domain, + apache::vhost::base { "ssl_${blog_domain}": + use_ssl => true, + vhost => $blog_domain, location => $blog_location, - content => template('blog/blogs_vhosts.conf'), + content => template('blog/blogs_vhosts.conf'), } file { $blog_location: - ensure => directory, - owner => apache, - group => apache, + ensure => directory, + owner => apache, + group => apache, } } @@ -56,7 +56,7 @@ class blog { ensure => directory, } - mga_common::local_script { 'backup_blog-db.sh': + mga_common::local_script { 'backup_blog-db.sh': content => template('blog/backup_blog-db.sh'), } -- cgit v1.2.1