Fixed a template typo.

Variable interpolation needs <%= not just <%. :)

Also, while I was in there, I replaced default with "oneiric",
because I don't actually know that the value is a good default value,
and I removed a couple of comments about moving to MySQL and Apache
modules from upstream.

Change-Id: Iec5b10cee2cbd0e0a2573fefa707d34d2a363cb4
This commit is contained in:
Monty Taylor 2012-07-28 10:03:35 -05:00
parent a2a516e914
commit 46282d44c1
2 changed files with 2 additions and 4 deletions

View File

@ -45,8 +45,6 @@
# testmode:
# Set this to true to disable cron jobs and replication,
# which can interfere with testing.
# TODO: move apache configuration to another module
# TODO: move mysql configuration to another module
# TODO: make more gerrit options configurable here
class gerrit($virtual_hostname=$fqdn,
@ -83,7 +81,7 @@ class gerrit($virtual_hostname=$fqdn,
$java_home = $lsbdistcodename ? {
"precise" => "/usr/lib/jvm/java-6-openjdk-amd64/jre",
default => "/usr/lib/jvm/java-6-openjdk/jre",
"oneiric" => "/usr/lib/jvm/java-6-openjdk/jre",
}
user { "gerrit2":

View File

@ -22,7 +22,7 @@
smtpServer = localhost
[container]
user = gerrit2
javaHome = <% java_home %>
javaHome = <%= java_home %>
<% if container_heaplimit != "" -%>
heapLimit = <%= container_heaplimit %>
<% end -%>