Skip to content
This repository was archived by the owner on Dec 12, 2023. It is now read-only.

Commit a3b2069

Browse files
author
Frank Wall
committed
fix compatibility with puppet4, fixes #2, fixes #3 
1 parent ffdd9c2 commit a3b2069

File tree

4 files changed

+50
-41
lines changed

4 files changed

+50
-41
lines changed

‎manifests/init.pp‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,21 @@
108108
# Derby specifics
109109
if $archiva_jdbc['driver'] == 'org.apache.derby.jdbc.EmbeddedDriver' {
110110
$archiva_u = regsubst($archiva_jdbc['url'],';.*$', '')
111-
$archiva_jdbc['shutdown_url'] = "${archiva_u};shutdown=true"
111+
$archiva_jdbc_new = merge($archiva_jdbc,
112+
hash(['shutdown_url',"${archiva_u};shutdown=true"]))
113+
114+
}
115+
else {
116+
$archiva_jdbc_new = $archiva_jdbc
112117
}
113118

114119
if $users_jdbc['driver'] == 'org.apache.derby.jdbc.EmbeddedDriver' {
115120
$users_u = regsubst($users_jdbc['url'], ';.*$', '')
116-
$users_jdbc['shutdown_url'] = "${users_u};shutdown=true"
121+
$users_jdbc_new = merge($users_jdbc,
122+
hash(['shutdown_url',"${users_u};shutdown=true"]))
123+
}
124+
else {
125+
$users_jdbc_new = $users_jdbc
117126
}
118127

119128
if $manage_user {

‎templates/jetty6.xml.erb‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -289,23 +289,23 @@
289289
<Arg>jdbc/archiva</Arg>
290290
<Arg>
291291
<New class="org.apache.commons.dbcp.BasicDataSource">
292-
<Set name="driverClassName"><%= @archiva_jdbc['driver'] %></Set>
293-
<Set name="url"><%= @archiva_jdbc['url'] %></Set>
294-
<Set name="username"><%= @archiva_jdbc['username'] %></Set>
295-
<Set name="password"><%= @archiva_jdbc['password'] %></Set>
292+
<Set name="driverClassName"><%= @archiva_jdbc_new['driver'] %></Set>
293+
<Set name="url"><%= @archiva_jdbc_new['url'] %></Set>
294+
<Set name="username"><%= @archiva_jdbc_new['username'] %></Set>
295+
<Set name="password"><%= @archiva_jdbc_new['password'] %></Set>
296296
</New>
297297
</Arg>
298298
</New>
299299

300-
<% if @archiva_jdbc['shutdown_url'] and !@archiva_jdbc['shutdown_url'].empty? %>
300+
<% if @archiva_jdbc_new['shutdown_url'] and !@archiva_jdbc_new['shutdown_url'].empty? %>
301301
<New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
302302
<Arg>jdbc/archivaShutdown</Arg>
303303
<Arg>
304304
<New class="org.apache.commons.dbcp.BasicDataSource">
305-
<Set name="driverClassName"><%= @archiva_jdbc['driver'] %></Set>
306-
<Set name="url"><%= @archiva_jdbc['shutdown_url'] %></Set>
307-
<Set name="username"><%= @archiva_jdbc['username'] %></Set>
308-
<Set name="password"><%= @archiva_jdbc['password'] %></Set>
305+
<Set name="driverClassName"><%= @archiva_jdbc_new['driver'] %></Set>
306+
<Set name="url"><%= @archiva_jdbc_new['shutdown_url'] %></Set>
307+
<Set name="username"><%= @archiva_jdbc_new['username'] %></Set>
308+
<Set name="password"><%= @archiva_jdbc_new['password'] %></Set>
309309
</New>
310310
</Arg>
311311
</New>
@@ -318,23 +318,23 @@
318318
<Arg>jdbc/users</Arg>
319319
<Arg>
320320
<New class="org.apache.commons.dbcp.BasicDataSource">
321-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
322-
<Set name="url"><%= @users_jdbc['url'] %></Set>
323-
<Set name="username"><%= @users_jdbc['username'] %></Set>
324-
<Set name="password"><%= @users_jdbc['password'] %></Set>
321+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
322+
<Set name="url"><%= @users_jdbc_new['url'] %></Set>
323+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
324+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
325325
</New>
326326
</Arg>
327327
</New>
328328

329-
<% if @users_jdbc['shutdown_url'] and !@users_jdbc['shutdown_url'].empty? %>
329+
<% if @users_jdbc_new['shutdown_url'] and !@users_jdbc_new['shutdown_url'].empty? %>
330330
<New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
331331
<Arg>jdbc/usersShutdown</Arg>
332332
<Arg>
333333
<New class="org.apache.commons.dbcp.BasicDataSource">
334-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
335-
<Set name="url"><%= @users_jdbc['shutdown_url'] %></Set>
336-
<Set name="username"><%= @users_jdbc['username'] %></Set>
337-
<Set name="password"><%= @users_jdbc['password'] %></Set>
334+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
335+
<Set name="url"><%= @users_jdbc_new['shutdown_url'] %></Set>
336+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
337+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
338338
</New>
339339
</Arg>
340340
</New>

‎templates/jetty7.xml.erb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,23 +296,23 @@
296296
<Arg>jdbc/users</Arg>
297297
<Arg>
298298
<New class="org.apache.commons.dbcp.BasicDataSource">
299-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
300-
<Set name="url"><%= @users_jdbc['url'] %></Set>
301-
<Set name="username"><%= @users_jdbc['username'] %></Set>
302-
<Set name="password"><%= @users_jdbc['password'] %></Set>
299+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
300+
<Set name="url"><%= @users_jdbc_new['url'] %></Set>
301+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
302+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
303303
</New>
304304
</Arg>
305305
</New>
306306

307-
<% if @users_jdbc['shutdown_url'] and !@users_jdbc['shutdown_url'].empty? %>
307+
<% if @users_jdbc_new['shutdown_url'] and !@users_jdbc_new['shutdown_url'].empty? %>
308308
<New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
309309
<Arg>jdbc/usersShutdown</Arg>
310310
<Arg>
311311
<New class="org.apache.commons.dbcp.BasicDataSource">
312-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
313-
<Set name="url"><%= @users_jdbc['shutdown_url'] %></Set>
314-
<Set name="username"><%= @users_jdbc['username'] %></Set>
315-
<Set name="password"><%= @users_jdbc['password'] %></Set>
312+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
313+
<Set name="url"><%= @users_jdbc_new['shutdown_url'] %></Set>
314+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
315+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
316316
</New>
317317
</Arg>
318318
</New>

‎templates/jetty8.xml.erb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -295,33 +295,33 @@
295295
<Arg>jdbc/users</Arg>
296296
<Arg>
297297
<New class="org.apache.tomcat.jdbc.pool.DataSource">
298-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
299-
<Set name="url"><%= @users_jdbc['url'] %></Set>
300-
<Set name="username"><%= @users_jdbc['username'] %></Set>
301-
<% unless @users_jdbc['password'].empty? -%>
302-
<Set name="password"><%= @users_jdbc['password'] %></Set>
298+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
299+
<Set name="url"><%= @users_jdbc_new['url'] %></Set>
300+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
301+
<% unless @users_jdbc_new['password'].empty? -%>
302+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
303303
<% end -%>
304304
<Set name="maxActive">20</Set>
305305
<Set name="removeAbandoned">true</Set>
306306
<Set name="logAbandoned">true</Set>
307307
<Set name="initialSize">5</Set>
308-
<Set name="testOnBorrow"><%= @users_jdbc['testOnBorrow'] || 'true' %></Set>
308+
<Set name="testOnBorrow"><%= @users_jdbc_new['testOnBorrow'] || 'true' %></Set>
309309
<!-- very rigourous sql query validation -->
310310
<Set name="validationQuery">select 1</Set>
311311
</New>
312312
</Arg>
313313
</New>
314314

315-
<% if @users_jdbc['shutdown_url'] and !@users_jdbc['shutdown_url'].empty? -%>
315+
<% if @users_jdbc_new['shutdown_url'] and !@users_jdbc_new['shutdown_url'].empty? -%>
316316
<New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
317317
<Arg>jdbc/usersShutdown</Arg>
318318
<Arg>
319319
<New class="org.apache.tomcat.jdbc.pool.DataSource">
320-
<Set name="driverClassName"><%= @users_jdbc['driver'] %></Set>
321-
<Set name="url"><%= @users_jdbc['shutdown_url'] %></Set>
322-
<Set name="username"><%= @users_jdbc['username'] %></Set>
323-
<% unless @users_jdbc['password'].empty? -%>
324-
<Set name="password"><%= @users_jdbc['password'] %></Set>
320+
<Set name="driverClassName"><%= @users_jdbc_new['driver'] %></Set>
321+
<Set name="url"><%= @users_jdbc_new['shutdown_url'] %></Set>
322+
<Set name="username"><%= @users_jdbc_new['username'] %></Set>
323+
<% unless @users_jdbc_new['password'].empty? -%>
324+
<Set name="password"><%= @users_jdbc_new['password'] %></Set>
325325
<% end -%>
326326
</New>
327327
</Arg>

0 commit comments

Comments
 (0)