diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-07-28 16:34:36 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-07-28 16:34:36 -0300 |
| commit | 61bbe6530eaf19bfedb09a923184763e130bf6c9 (patch) | |
| tree | 4f9075532d9ec4177357358fd1aac8151c2d8e69 /manifests/init.pp | |
| parent | 39a6de3db7edd8e2089de085683dbeb45a684581 (diff) | |
| download | puppet-ikiwiki-61bbe6530eaf19bfedb09a923184763e130bf6c9.tar.gz puppet-ikiwiki-61bbe6530eaf19bfedb09a923184763e130bf6c9.tar.bz2 | |
Making ikiwiki-refresh to call ikiwiki-deploy if needed
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index a36cc55..e6eeee2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -47,12 +47,6 @@ class ikiwiki { command => "/usr/local/sbin/ikiwiki-refresh $name $instance", user => root, refreshonly => true, - onlyif => "/bin/sh -c '[ ! -f ${apache_sites_folder}/${name}/${instance}_src/index.mdwn ]'", - } - - exec { "/usr/local/sbin/ikiwiki-deploy $name $instance": - creates => "${apache_sites_folder}/${name}/${instance}_src/index.mdwn", - user => root, } if !defined(File["${apache_sites_folder}/${name}/${instance}_src"]) { @@ -95,10 +89,11 @@ class ikiwiki { # file { [ "/var/git/repositories/${name}.git/hooks/post-update", "${apache_sites_folder}/${name}/${instance}/ikiwiki.cgi" ]: - ensure => present, - owner => www-data, - group => gitosis, - mode => 6550, + ensure => present, + owner => www-data, + group => gitosis, + mode => 6550, + require => File["/etc/ikiwiki/$name.setup"], } } 'absent': { |