diff --git a/manifests/init.pp b/manifests/init.pp index 9801379..d379988 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,19 +1,19 @@ class planet { - package { 'planet-venus': - ensure => present + ensure => present, } file { '/srv/planet': - ensure => directory + ensure => directory, } file { '/var/lib/planet': - ensure => directory + ensure => directory, } file { '/var/log/planet': - ensure => directory + ensure => directory, } - } + +# vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/manifests/site.pp b/manifests/site.pp index cf26ce4..96a5d5b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,26 +1,29 @@ -define planet::site($git_url, $vhost_name="planet.${name}.org") { - +define planet::site( + $git_url, + $vhost_name = "planet.${name}.org" +) { include apache include remove_nginx apache::vhost { $vhost_name: - port => 80, + docroot => "/srv/planet/${name}", + port => 80, priority => '50', - docroot => "/srv/planet/${name}", - require => File["/srv/planet"], + require => File['/srv/planet'], } vcsrepo { "/var/lib/planet/${name}": - ensure => present, + ensure => present, provider => git, - source => $git_url, - require => File['/var/lib/planet'], + require => File['/var/lib/planet'], + source => $git_url, } cron { "update_planet_${name}": - user => root, - minute => "*/5", - command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && git pull -q --ff-only && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1" + command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && git pull -q --ff-only && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1", + minute => '*/5', + user => 'root', } - } + +# vim:sw=2:ts=2:expandtab:textwidth=79