1 files changed, 31 insertions, 30 deletions

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index e5b127b7..8aacd5cc 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -1,56 +1,57 @@
 class planet {
 
-    user { "planet":
-        groups => apache,
-        comment => "Planet Mageia",
-        home => "/var/lib/planet",
+    user { 'planet':
+        groups  => 'apache',
+        comment => 'Planet Mageia',
+        home    => '/var/lib/planet',
     }
 
-    $location = "/var/www/vhosts/planet.$domain"
-    $vhost = "planet.$domain"
-	
-    include apache::mod_php
-    include apache::mod_deflate
+    $vhost = "planet.${::domain}"
+    $location = "/var/www/vhosts/${vhost}"
 
-    apache::vhost_base { "$vhost":
+    include apache::mod::php
+
+    apache::vhost::base { $vhost:
+        location => $location,
+        content  => template('planet/planet_vhosts.conf')
+    }
+
+    apache::vhost::base { "ssl_${vhost}":
+        use_ssl  => true,
+        vhost    => $vhost,
         location => $location,
-        content => template('planet/planet_vhosts.conf')
+        content  => template('planet/planet_vhosts.conf')
     }
 
-    local_script { "deploy_new-planet.sh":
-        content => template("planet/deploy_new-planet.sh")
+    mga_common::local_script { 'deploy_new-planet.sh':
+        content => template('planet/deploy_new-planet.sh')
     }
 
-    file { "$location":
+    file { $location:
         ensure => directory,
-        owner => planet,
-        group => apache,
     }
 
-    file { "$location/index.php":
-        owner => planet,
-        group => apache,
-        mode => 755,
-        content => template("planet/index.php")
+    file { "${location}/index.php":
+        content => template('planet/index.php')
     }
 
-    package { ['php-iconv']: }    
+    package { ['php-iconv']: }
 
     class files_backup inherits base {
-        file { "/var/lib/planet/backup":
+        file { '/var/lib/planet/backup':
                 ensure => directory,
         }
 
-        local_script { "backup_planet-files.sh":
-            content => template("blog/backup_planet-files.sh")
+        mga_common::local_script { 'backup_planet-files.sh':
+            content => template('blog/backup_planet-files.sh')
         }
 
         cron { "Backup files (planet)":
-            user => root,
-            hour => '23',
-            minute => '42',
-            command => "/usr/local/bin/backup_planet-files.sh",
-            require => [File["backup_planet-files"]],
+            user    => root,
+            hour    => '23',
+            minute  => '42',
+            command => '/usr/local/bin/backup_planet-files.sh',
+            require => [File['backup_planet-files']],
         }
     }
 }