diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-10-03 14:09:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-10-03 14:09:18 -0300 |
| commit | 6872c12233cda9e6e58dceedbb118ea30c655c63 (patch) | |
| tree | 7588d98d6f85870f27c7ab8b97d0f8d8c88ebfad | |
| parent | 3f055da762cb03117de80a38a9ae4194cd9e9d28 (diff) | |
| download | puppet-ikiwiki-6872c12233cda9e6e58dceedbb118ea30c655c63.tar.gz puppet-ikiwiki-6872c12233cda9e6e58dceedbb118ea30c655c63.tar.bz2 | |
Adding cgi parameter to ikiwiki::instance
| -rw-r--r-- | manifests/instance.pp | 1 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/instance.pp b/manifests/instance.pp index ac44fb2..a059465 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -10,6 +10,7 @@ define ikiwiki::instance( $protocol = 'https', $owner = $name, $group = $name, + $cgi = '1', ) { case $ensure { 'present': { diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index 986eb3a..75ceb49 100644 --- a/templates/ikiwiki.setup.erb +++ b/templates/ikiwiki.setup.erb @@ -62,7 +62,7 @@ use IkiWiki::Setup::Standard { wrappers => [ { # The cgi wrapper. - cgi => 1, + cgi => <%= cgi %>, wrapper => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki/ikiwiki.cgi", wrappermode => "06550", wrappergroup => "<%= scope.lookupvar('ikiwiki::www_user') %>", |