1 files changed, 32 insertions, 22 deletions

diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 585b5c16..c89a8168 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -1,9 +1,11 @@
 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_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_newpost_email_to = "i18n-reports@ml.${::domain}"
+        $blog_newpost_email_from = "Mageia Blog bot <blog@${::domain}>"
 
         user { 'blog':
             groups  => apache,
@@ -11,13 +13,21 @@ class blog {
             home    => '/var/lib/blog',
         }
     }
-    
+
     class files_bots inherits base {
-        package { ['php-mysql',
+if versioncmp($::lsbdistrelease, '9') < 0 {
+        package { ['php-mysqlnd',
+                   'php-ldap',
+                   'unzip',
+                   'nail']: }
+} else {
+        package { ['php-mysqlnd',
                    'php-ldap',
-                   'unzip']: }
+                   'unzip',
+                   's-nail']: }
+}
 
-        mga-common::local_script { 'check_new-blog-post.sh':
+        mga_common::local_script { 'check_new-blog-post.sh':
             content => template('blog/check_new-blog-post.sh'),
         }
 
@@ -25,27 +35,27 @@ class blog {
             user    => 'blog',
             minute  => '*/15',
             command => '/usr/local/bin/check_new-blog-post.sh',
-            require => Local_script['check_new-blog-post.sh'],
+            require => Mga_common::Local_script['check_new-blog-post.sh'],
         }
 
         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,
         }
     }
 
@@ -54,7 +64,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'),
         }
 
@@ -63,7 +73,7 @@ class blog {
             hour    => '23',
             minute  => '42',
             command => '/usr/local/bin/backup_blog-db.sh',
-            require => Local_script['backup_blog-db.sh'],
+            require => Mga_common::Local_script['backup_blog-db.sh'],
         }
     }
 
@@ -72,7 +82,7 @@ class blog {
                 ensure => directory,
         }
 
-        mga-common::local_script { 'backup_blog-files.sh':
+        mga_common::local_script { 'backup_blog-files.sh':
             content => template('blog/backup_blog-files.sh'),
         }
 
@@ -81,7 +91,7 @@ class blog {
             hour    => '23',
             minute  => '42',
             command => '/usr/local/bin/backup_blog-files.sh',
-            require => Local_script['backup_blog-files.sh'],
+            require => Mga_common::Local_script['backup_blog-files.sh'],
         }
     }
 }