aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:28:20 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:28:20 -0300
commit79a15295e104ca7d33cc2b471cc2472da5b34dc8 (patch)
treef6d0573252bb6169a8cc353bdd11642746f3f0e6
parentc9df0ab1285b91fdb11b4b6b13ae1f09e30b53ae (diff)
downloadpuppet-ikiwiki-79a15295e104ca7d33cc2b471cc2472da5b34dc8.tar.gz
puppet-ikiwiki-79a15295e104ca7d33cc2b471cc2472da5b34dc8.tar.bz2
README enhancement
-rw-r--r--README43
1 files changed, 42 insertions, 1 deletions
diff --git a/README b/README
index a5c4a87..1879a06 100644
--- a/README
+++ b/README
@@ -1,7 +1,48 @@
Sarava's Ikiwiki Puppet Module
==============================
-This is an attempt to make a simple and straightforward puppet module to manage ikiwiki instances.
+This is an attempt to make a simple and straightforward puppet module to manage ikiwiki instances
+leveraging a git daemon such as gitolite.
Gitolite or gitosis is needed but should be managed elsewhere. Please setup your keys before deploying
the instances.
+
+How it works
+------------
+
+The following setup is used:
+
+ - Wiki pages are served under it's own user, but the cgi usually runs under www-data.
+ - The git daemon runs on its own user and group.
+
+So the recommended suid for the cgi and the post update hook are used normally.
+
+For that to work, you, the wiki user and root needs ssh read/write access to the git daemon:
+
+ - You need to be able to push an pull changes to the git daemon.
+ - The cgi backend also needs push and pull access to the bare repository.
+ - Gitolite needs permission to write into the repository working copy and be able to generate pages.
+ - Root also needs access to the repo so "ikiwiki --setup" can be run as root.
+
+Usage example
+-------------
+
+ # Declare the ikiwiki class
+ class { 'ikiwiki': }
+
+ # Define your website using your http server module of choice.
+ apache::site { "mywiki":
+ docroot => "${apache::sites_folder}/mywiki/ikiwiki",
+ use => [ "Ikiwiki mywiki" ],
+ owner => 'mywiki',
+ group => 'mywiki',
+ }
+
+ # Define your ikiwiki instance.
+ ikiwiki::instance { "mywiki":
+ ensure => present,
+ description => "My Ikiwiki",
+ adminuser => "myuser",
+ disable_plugins => "openid",
+ add_plugins => "goodstuff sidebar",
+ }