aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-19 22:21:47 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-19 22:21:47 +0300
commitfab910c7f712f878c10d121cef3e0452e2b51709 (patch)
tree280cfdd71e92cfe567d53457d507a2ebce1f6cf6
parentf295da3499b5d99c7fdb866f2cde9c595efb5b85 (diff)
downloadpuppet-fab910c7f712f878c10d121cef3e0452e2b51709.tar
puppet-fab910c7f712f878c10d121cef3e0452e2b51709.tar.gz
puppet-fab910c7f712f878c10d121cef3e0452e2b51709.tar.bz2
puppet-fab910c7f712f878c10d121cef3e0452e2b51709.tar.xz
puppet-fab910c7f712f878c10d121cef3e0452e2b51709.zip
lint fixes for blog
-rw-r--r--modules/blog/manifests/init.pp28
-rw-r--r--modules/blog/templates/blogs_vhosts.conf2
-rwxr-xr-xmodules/blog/templates/check_new-blog-post.sh2
3 files changed, 16 insertions, 16 deletions
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 <blog@mageia.org>'
@@ -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'),
}
diff --git a/modules/blog/templates/blogs_vhosts.conf b/modules/blog/templates/blogs_vhosts.conf
index 48b6d9ad..ff3c792f 100644
--- a/modules/blog/templates/blogs_vhosts.conf
+++ b/modules/blog/templates/blogs_vhosts.conf
@@ -2,7 +2,7 @@
Order deny,allow
Allow from All
AllowOverride All
- Options FollowSymlinks
+ Options FollowSymlinks
Options +Indexes
</Directory>
# Add a permanent redirection for 'pt' as it was 'pt-br' before
diff --git a/modules/blog/templates/check_new-blog-post.sh b/modules/blog/templates/check_new-blog-post.sh
index 2123ed4a..f9f442cd 100755
--- a/modules/blog/templates/check_new-blog-post.sh
+++ b/modules/blog/templates/check_new-blog-post.sh
@@ -3,7 +3,7 @@
# Initialization
PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/blog}
/usr/bin/wget -qO $PATH_TO_FILE"/last_tmp" http://blog.mageia.org/en/?feed=rss2
-if [ $? -ne 0 ]
+if [ $? -ne 0 ]
then
exit 2
fi