Skip to content

Commit

Permalink
Merge pull request #410 from jooooooon/bug_5003/initial_promises_on_s…
Browse files Browse the repository at this point in the history
…erver_cause_an_error_to_be_logged_due_to_duplicate_empty_file_before_editing_setting

Fixes #5003: initial promises on server cause an error to be logged due ...
  • Loading branch information
ncharles committed Jun 11, 2014
2 parents 7b07375 + 534577d commit 463c2c4
Showing 1 changed file with 1 addition and 2 deletions.
Expand Up @@ -109,9 +109,8 @@ bundle agent install_rsyslogd
policy_server::
"/etc/rsyslog.d/rudder.conf"
create => "true",
edit_defaults => empty,
edit_line => expand_template("${sys.workdir}/inputs/distributePolicy/rsyslog.conf/rudder.conf"),
edit_defaults => noempty_backup,
edit_defaults => empty_backup,
classes => cf2_if_else("rudder_rsyslog_conf_copied", "cannot_copy_rudder_rsyslog_conf"),
comment => "Copying rsyslog conf";

Expand Down

0 comments on commit 463c2c4

Please sign in to comment.