projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wiki -> hiera role; explicitly include apache2
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
pubsub
/
config.pp
diff --git
a/modules/roles/manifests/pubsub/config.pp
b/modules/roles/manifests/pubsub/config.pp
index
7c9e38d
..
24499bf
100644
(file)
--- a/
modules/roles/manifests/pubsub/config.pp
+++ b/
modules/roles/manifests/pubsub/config.pp
@@
-55,13
+55,13
@@
define roles::pubsub::config (
$exchange=dsa,
$username=$::fqdn,
$queue=undef,
$exchange=dsa,
$username=$::fqdn,
$queue=undef,
- $order=
00
+ $order=
'00'
){
include roles::pubsub::config::setup
concat::fragment { "pubsub_conf_${name}":
){
include roles::pubsub::config::setup
concat::fragment { "pubsub_conf_${name}":
- target => '/etc/dsa/pubsub.conf',
-
source => 'puppet:///modules/roles/pubsub/pubsub.conf.erb'
,
- order => $order,
+ target
=> '/etc/dsa/pubsub.conf',
+
content => template('roles/pubsub/pubsub.conf.erb')
,
+ order
=> $order,
}
}
}
}