diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index 71a638b..ea4bbff 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -149,25 +149,25 @@ class rhizo_base { require => File['/var/rhizo_backups'], } -# vcsrepo { '/var/rhizomatica': -# ensure => latest, -# provider => git, -# source => 'https://github.com/Rhizomatica/rccn.git', -# revision => 'master', -# require => [ File['/var/rhizomatica'], Package['git'] ], -# notify => [ Exec['install_rccn'], Exec['locale-gen'] ], -# } + vcsrepo { '/var/rhizomatica': + ensure => latest, + provider => git, + source => 'https://github.com/Rhizomatica/rccn.git', + revision => 'master', + require => [ File['/var/rhizomatica'], Package['git'] ], + notify => [ Exec['install_rccn'], Exec['locale-gen'] ], + } file { '/var/rhizomatica/rccn/config_values.py': ensure => present, content => template('rhizo_base/config_values.py.erb'), -# require => Vcsrepo['/var/rhizomatica'], + require => Vcsrepo['/var/rhizomatica'], } file { '/var/rhizomatica/rai/include/database.php': ensure => present, content => template('rhizo_base/database.php.erb'), -# require => Vcsrepo['/var/rhizomatica'], + require => Vcsrepo['/var/rhizomatica'], } exec { 'install_rccn': @@ -193,14 +193,13 @@ class rhizo_base { file { '/var/www/html/rai': ensure => link, target => '/var/rhizomatica/rai', - require => Package['apache2'], -# [ Vcsrepo['/var/rhizomatica'], ], + require => [ Package['apache2'], Vcsrepo['/var/rhizomatica'] ], } file { '/var/www/html/rai/graphs': ensure => link, target => '/var/rhizomatica/rrd/graphs', -# require => Vcsrepo['/var/rhizomatica'], + require => Vcsrepo['/var/rhizomatica'], }