Merge pull request #98 from migs/master

Trying different ERB syntax

Author: garethjevans

jobs/sonarqube/templates/config/sonar.properties

@@ -12,20 +12,20 @@
 # Permissions to create tables, indices and triggers must be granted to JDBC user.
 # The schema must be created first.
 <% if p('sonar.database.type') != 'H2' %>
-<%= sonar.jdbc.username= %><%= p('sonar.database.username') %>
-<%= sonar.jdbc.password= %><%= p('sonar.database.password') %>
+sonar.jdbc.username=<%= p('sonar.database.username') %>
+sonar.jdbc.password=<%= p('sonar.database.password') %>
 <% end %>
 
 #----- Embedded Database (default)
 # H2 embedded database server listening port, defaults to 9092
 <% if p('sonar.database.type') == 'H2' %>
-<%= sonar.embeddedDatabase.port=9092 %>
+sonar.embeddedDatabase.port=9092
 <% end %>
 #----- MySQL 5.6 or greater
 # Only InnoDB storage engine is supported (not myISAM).
 # Only the bundled driver is supported. It can not be changed.
 <% if p('sonar.database.type') == 'MYSQL' %>
-<%= sonar.jdbc.url=jdbc:mysql:// %><%= p('sonar.database.host') %><%= :3306/sonar_db?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance&useSSL=false %>
+sonar.jdbc.url=jdbc:mysql://<%= p('sonar.database.host') %>:3306/sonar_db?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance&useSSL=false
 <% end %>
 
 #----- Oracle 11g/12c