diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:05:49 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:05:49 -0200 |
| commit | fc6433630e29e2d4ea940324c71a78e12d0def3c (patch) | |
| tree | 27cac6b9eb6d05331b89f238669c708675bc8688 /templates | |
| parent | ce6ab8ffe205dfc0fb9fef828b3f13f36b67fa18 (diff) | |
| download | puppet-ikiwiki-fc6433630e29e2d4ea940324c71a78e12d0def3c.tar.gz puppet-ikiwiki-fc6433630e29e2d4ea940324c71a78e12d0def3c.tar.bz2 | |
Upgrading for 2.7 compatibility
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/deploy.sh.erb | 2 | ||||
| -rw-r--r-- | templates/ikiwiki.setup.erb | 6 | ||||
| -rw-r--r-- | templates/refresh.sh.erb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb index e5bfa92..4bbfb43 100644 --- a/templates/deploy.sh.erb +++ b/templates/deploy.sh.erb @@ -2,7 +2,7 @@ NAME="$1" INSTANCE="$2" -BASE="<%= apache_sites_folder %>" +BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>" SITE=$BASE/$NAME CONF="/etc/ikiwiki" WEB_OWNER="www-data" diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb index 56d5ad2..1c90988 100644 --- a/templates/ikiwiki.setup.erb +++ b/templates/ikiwiki.setup.erb @@ -11,8 +11,8 @@ use IkiWiki::Setup::Standard { adminemail => '<%= adminemail %>', # Be sure to customise these.. - srcdir => "<%= apache_sites_folder %>/<%= name %>/ikiwiki_src", - destdir => "<%= apache_sites_folder %>/<%= name %>/ikiwiki", + srcdir => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki_src", + destdir => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki", url => "<%= protocol %>://<%= name %>.<%= base_url %>", cgiurl => "<%= protocol %>://<%= name %>.<%= base_url %>/ikiwiki.cgi", @@ -63,7 +63,7 @@ use IkiWiki::Setup::Standard { { # The cgi wrapper. cgi => 1, - wrapper => "<%= apache_sites_folder %>/<%= name %>/ikiwiki/ikiwiki.cgi", + wrapper => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki/ikiwiki.cgi", wrappermode => "06550", wrappergroup => "gitosis", }, diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb index 6680f23..0b2b796 100644 --- a/templates/refresh.sh.erb +++ b/templates/refresh.sh.erb @@ -2,7 +2,7 @@ NAME="$1" INSTANCE="$2" -BASE="<%= apache_sites_folder %>" +BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>" SITE=$BASE/$NAME CONF="/etc/ikiwiki" WEB_OWNER="www-data" |