aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-06-18 15:30:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-06-18 15:30:36 -0300
commit64945aa6c196fef9e1654c50a9c22db54b979028 (patch)
tree066af800f7fb7118504c6f13251b64e085a584fe
parentf62337afa2dfc12d9b1f7c4f28b06d7a413d3d51 (diff)
downloadpuppet-ikiwiki-64945aa6c196fef9e1654c50a9c22db54b979028.tar.gz
puppet-ikiwiki-64945aa6c196fef9e1654c50a9c22db54b979028.tar.bz2
Packages in dedicated classes
-rw-r--r--manifests/ikiwiki/packages.pp5
-rw-r--r--manifests/init.pp10
2 files changed, 6 insertions, 9 deletions
diff --git a/manifests/ikiwiki/packages.pp b/manifests/ikiwiki/packages.pp
new file mode 100644
index 0000000..3669048
--- /dev/null
+++ b/manifests/ikiwiki/packages.pp
@@ -0,0 +1,5 @@
+class ikiwiki::packages {
+ package { [ "ikiwiki", "po4a" ]:
+ ensure => installed,
+ }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 15276de..7831645 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,15 +4,7 @@ class ikiwiki(
$git_implementation = 'git',
$git_folder = '/var/git/repositories'
) {
- package { [ "ikiwiki", "po4a" ]:
- ensure => installed,
- }
-
- # Search support
- # http://ikiwiki.info/plugins/search/
- package { [ 'libsearch-xapian-perl', 'libdigest-sha-perl', 'libhtml-scrubber-perl', 'xapian-omega' ]:
- ensure => present,
- }
+ class { [ 'ikiwiki::packages', 'ikiwiki::packages::search' ]: }
file { "/usr/local/sbin/ikiwiki-deploy":
ensure => present,