Skip to content

Commit

Permalink
Workaround duplicate configs on package upgrades
Browse files Browse the repository at this point in the history
The bareos package deploy default configs if they dont exist. This can
lead to conflicts with the config and the package fails to upgrade.
We just set the file names fix for those resources which are only
allowed to exist once.
Fix #25
  • Loading branch information
project0 committed May 16, 2018
1 parent 4532fec commit 689b6bf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion manifests/client/client.pp
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
$_require_res_messages = undef
}

file { "${::bareos::client::config_dir}/${_resource_dir}/${name_client}.conf":
file { "${::bareos::client::config_dir}/${_resource_dir}/bareos-sd.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
Expand Down
2 changes: 1 addition & 1 deletion manifests/director/director.pp
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
$_require_resource = undef
}

file { "${::bareos::director::config_dir}/${_resource_dir}/${name_director}.conf":
file { "${::bareos::director::config_dir}/${_resource_dir}/bareos-dir.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
Expand Down
2 changes: 1 addition & 1 deletion manifests/storage/storage.pp
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
$_require_resource = undef
}

file { "${::bareos::storage::config_dir}/${_resource_dir}/${name_storage}.conf":
file { "${::bareos::storage::config_dir}/${_resource_dir}/bareos-sd.conf":
ensure => $ensure,
mode => $::bareos::file_mode,
owner => $::bareos::file_owner,
Expand Down

0 comments on commit 689b6bf

Please sign in to comment.