Skip to content

Commit 7f047f4

Browse files
committed
Merge pull request #104 from cyberious/ConfigFix
(maint) upcase instance name in config file
2 parents e5d8c31 + 834d27c commit 7f047f4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

manifests/config.pp

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
$instance_name = $title,
2525
) {
2626
#possible future parameter if we do end up supporting different install directories
27+
$_instance = upcase($instance_name)
2728
$config_dir = "${::puppet_vardir}/cache/sqlserver"
28-
$config_file = "${config_dir}/.${instance_name}.cfg"
29+
$config_file = "${config_dir}/.${_instance}.cfg"
2930
ensure_resource('file', ["${::puppet_vardir}/cache",$config_dir], { 'ensure' => 'directory','recurse' => 'true' })
3031

3132
file{ $config_file:

templates/instance_config.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "instance": "<%= @instance_name %>","admin":"<%= @admin_user %>","pass":"<%= @admin_pass %>" }
1+
{ "instance": "<%= @_instance %>","admin":"<%= @admin_user %>","pass":"<%= @admin_pass %>" }

0 commit comments

Comments
 (0)