1 files changed, 59 insertions, 70 deletions

diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 291d0ef1..c89a8168 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -1,108 +1,97 @@
 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'
+        $blog_newpost_email_to = "i18n-reports@ml.${::domain}"
+        $blog_newpost_email_from = "Mageia Blog bot <blog@${::domain}>"
 
-        user { "blog":
-        groups => apache,
-        comment => "Mageia Blog",
-        home => "/var/lib/blog",
+        user { 'blog':
+            groups  => apache,
+            comment => 'Mageia Blog bot',
+            home    => '/var/lib/blog',
         }
     }
-    
-    class files-bots inherits base {
-        package { ['wget','php-mysql','php-ldap','unzip']:
-            ensure => installed
-        }
 
-        file { "check_new-blog-post":
-            path => "/usr/local/bin/check_new-blog-post.sh",
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 755,
-            content => template("blog/check_new-blog-post.sh")
+    class files_bots inherits base {
+if versioncmp($::lsbdistrelease, '9') < 0 {
+        package { ['php-mysqlnd',
+                   'php-ldap',
+                   'unzip',
+                   'nail']: }
+} else {
+        package { ['php-mysqlnd',
+                   'php-ldap',
+                   'unzip',
+                   's-nail']: }
+}
+
+        mga_common::local_script { 'check_new-blog-post.sh':
+            content => template('blog/check_new-blog-post.sh'),
         }
-   
-        cron { "Blog bot":
-            user => blog,
-            minute => '*/15',
-            command => "/usr/local/bin/check_new-blog-post.sh",
-            require => [File["check_new-blog-post"], User['blog']],
+
+        cron { 'Blog bot':
+            user    => 'blog',
+            minute  => '*/15',
+            command => '/usr/local/bin/check_new-blog-post.sh',
+            require => Mga_common::Local_script['check_new-blog-post.sh'],
         }
 
-        include apache::mod_php
+        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,
-	        mode => 644,
+        file { $blog_location:
+                ensure => directory,
+                owner  => apache,
+                group  => apache,
         }
     }
+
     class db_backup inherits base {
         file { $blog_db_backupdir:
                 ensure => directory,
-                owner => root,
-                group => root,
-                mode => 644,
         }
 
-	file { "backup_blog-db":
-            path => "/usr/local/bin/backup_blog-db.sh",
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 755,
-            content => template("blog/backup_blog-db.sh")
+            mga_common::local_script { 'backup_blog-db.sh':
+            content => template('blog/backup_blog-db.sh'),
         }
 
         cron { "Backup DB (blog)":
-            user => root,
-            hour => '23',
-            minute => '42',
-            command => "/usr/local/bin/backup_blog-db.sh",
-            require => [File["backup_blog-db"]],
+            user    => root,
+            hour    => '23',
+            minute  => '42',
+            command => '/usr/local/bin/backup_blog-db.sh',
+            require => Mga_common::Local_script['backup_blog-db.sh'],
         }
     }
+
     class files_backup inherits base {
         file { $blog_files_backupdir:
                 ensure => directory,
-                owner => root,
-                group => root,
-                mode => 644,
         }
 
-        file { "backup_blog-files":
-            path => "/usr/local/bin/backup_blog-files.sh",
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 755,
-            content => template("blog/backup_blog-files.sh")
+        mga_common::local_script { 'backup_blog-files.sh':
+            content => template('blog/backup_blog-files.sh'),
         }
 
-        cron { "Backup files (blog)":
-            user => root,
-            hour => '23',
-            minute => '42',
-            command => "/usr/local/bin/backup_blog-files.sh",
-            require => [File["backup_blog-files"]],
+        cron { 'Backup files (blog)':
+            user    => root,
+            hour    => '23',
+            minute  => '42',
+            command => '/usr/local/bin/backup_blog-files.sh',
+            require => Mga_common::Local_script['backup_blog-files.sh'],
         }
     }
 }