diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 21:28:50 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 21:28:50 -0300 |
| commit | 280cb7c481fd3c70b5c54c31c64ae05e187bc0ac (patch) | |
| tree | 04fb4b6c19bb42481e82e4ccb9fa7df492b6f282 | |
| parent | fcbd5270b862e2f1e5405071cf721e289d6fa3ef (diff) | |
| download | puppet-ikiwiki-280cb7c481fd3c70b5c54c31c64ae05e187bc0ac.tar.gz puppet-ikiwiki-280cb7c481fd3c70b5c54c31c64ae05e187bc0ac.tar.bz2 | |
Cleanup, README update and dependency fixes
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | manifests/instance.pp | 18 |
2 files changed, 11 insertions, 12 deletions
@@ -46,3 +46,8 @@ Usage example disable_plugins => "openid", add_plugins => "goodstuff sidebar", } + +References +---------- + +- See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/ diff --git a/manifests/instance.pp b/manifests/instance.pp index bd46af7..f845f68 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -13,7 +13,6 @@ define ikiwiki::instance( $home = "/home/$owner", $create_ssh_key = false ) { - case $ensure { 'present': { file { "/etc/ikiwiki/$name.setup": @@ -69,14 +68,6 @@ define ikiwiki::instance( } } - if !defined(File["${ikiwiki::sites_folder}/${name}"]) { - file { "${ikiwiki::sites_folder}/${name}": - ensure => directory, - owner => root, - group => root, - } - } - exec { "ssh-keygen-ikiwiki-${owner}": command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/id_rsa", creates => "${home}/.ssh/id_rsa", @@ -86,13 +77,14 @@ define ikiwiki::instance( } } - # See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/ file { "${ikiwiki::git_folder}/${name}.git/hooks/post-update": ensure => present, owner => $owner, group => $ikiwiki::git_implementation, mode => 6550, - require => File["/etc/ikiwiki/$name.setup"], + require => File["/etc/ikiwiki/$name.setup" + "${ikiwiki::sites_folder}/${name}/ikiwiki", + "${ikiwiki::sites_folder}/${name}/ikiwiki_src"], } file { "${ikiwiki::sites_folder}/${name}/ikiwiki/ikiwiki.cgi": @@ -100,7 +92,9 @@ define ikiwiki::instance( owner => $owner, group => $ikiwiki::www_user, mode => 6550, - require => File["/etc/ikiwiki/$name.setup"], + require => File["/etc/ikiwiki/$name.setup" + "${ikiwiki::sites_folder}/${name}/ikiwiki", + "${ikiwiki::sites_folder}/${name}/ikiwiki_src"], } } 'absent': { |