diff options
Diffstat (limited to 'modules/planet/manifests/init.pp')
| -rw-r--r-- | modules/planet/manifests/init.pp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp index 2fbfab85..8aacd5cc 100644 --- a/modules/planet/manifests/init.pp +++ b/modules/planet/manifests/init.pp @@ -6,18 +6,24 @@ class planet { home => '/var/lib/planet', } - $vhost = "planet.$::domain" - $location = "/var/www/vhosts/$vhost" - + $vhost = "planet.${::domain}" + $location = "/var/www/vhosts/${vhost}" + include apache::mod::php - include apache::mod::deflate apache::vhost::base { $vhost: location => $location, content => template('planet/planet_vhosts.conf') } - local_script { 'deploy_new-planet.sh': + apache::vhost::base { "ssl_${vhost}": + use_ssl => true, + vhost => $vhost, + location => $location, + content => template('planet/planet_vhosts.conf') + } + + mga_common::local_script { 'deploy_new-planet.sh': content => template('planet/deploy_new-planet.sh') } @@ -25,27 +31,27 @@ class planet { ensure => directory, } - file { "$location/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']], } } } |