diff options
Diffstat (limited to '')
| -rw-r--r-- | cfengine/watchdog.cf | 2 | ||||
| -rw-r--r-- | services/applications/check_mk.cf | 2 | ||||
| -rw-r--r-- | services/applications/nagios.cf | 2 | ||||
| -rw-r--r-- | services/applications/sshd.cf | 2 | ||||
| -rw-r--r-- | services/common.cf | 2 | ||||
| -rw-r--r-- | templates/cfengine/cfengine_watchdog.cftpl (renamed from templates/cfengine/cfengine_watchdog) | 0 | ||||
| -rw-r--r-- | templates/check_mk/check_mk_agent.freebsd.cftpl (renamed from templates/check_mk/check_mk_agent.freebsd) | 0 | ||||
| -rw-r--r-- | templates/common/hosts.cftpl (renamed from templates/common/hosts) | 0 | ||||
| -rw-r--r-- | templates/nginx/nagios_htpasswd.cftpl (renamed from templates/nginx/nagios_htpasswd) | 0 | ||||
| -rw-r--r-- | templates/sshd/authorized_keys.cftpl (renamed from templates/sshd/authorized_keys) | 0 | ||||
| -rw-r--r-- | update.cf | 6 |
11 files changed, 8 insertions, 8 deletions
diff --git a/cfengine/watchdog.cf b/cfengine/watchdog.cf index baf3993..f1fec41 100644 --- a/cfengine/watchdog.cf +++ b/cfengine/watchdog.cf @@ -10,7 +10,7 @@ bundle agent cfengine_watchdog "/etc/cron.d/cfengine_watchdog" create => "true", perms => system_owned("444"), - edit_template => "$(sys.inputdir)/templates/cfengine/cfengine_watchdog", + edit_template => "$(sys.inputdir)/templates/cfengine/cfengine_watchdog.cftpl", template_method => "mustache", template_data => parsejson("$(data)"), classes => if_repaired("cfengine_watchdog_repaired"); diff --git a/services/applications/check_mk.cf b/services/applications/check_mk.cf index 8a1ce82..c453453 100644 --- a/services/applications/check_mk.cf +++ b/services/applications/check_mk.cf @@ -20,7 +20,7 @@ bundle agent check_mk classes => if_repaired("check_mk_inetd_conf_file_repaired"); "/usr/local/bin/check_mk_agent" perms => system_owned("555"), - copy_from => local_cp("$(sys.inputdir)/templates/check_mk/check_mk_agent.freebsd"), + copy_from => local_cp("$(sys.inputdir)/templates/check_mk/check_mk_agent.freebsd.cftpl"), classes => if_repaired("check_mk_agent_repaired"); classes: freebsd:: diff --git a/services/applications/nagios.cf b/services/applications/nagios.cf index 8c732c8..ba429cf 100644 --- a/services/applications/nagios.cf +++ b/services/applications/nagios.cf @@ -12,7 +12,7 @@ bundle agent nagios "nagios" usebundle => fcgiwrap("nagios", "www", "770"); "nagios" usebundle => php56(); "nagios" usebundle => nginx("$(sys.inputdir)/templates/nginx/nagios_nginx.conf", "nginx.conf"); - "nagios" usebundle => nginx("$(sys.inputdir)/templates/nginx/nagios_htpasswd", "htpasswd"); + "nagios" usebundle => nginx("$(sys.inputdir)/templates/nginx/nagios_htpasswd.cftpl", "htpasswd"); "nagios" usebundle => install_package("$(this.bundle)", "$(nagios.packages)"); "nagios" usebundle => add_rc_conf_line("$(this.bundle)", "nagios_enable=\"YES\""); files: diff --git a/services/applications/sshd.cf b/services/applications/sshd.cf index bb452e4..7cf58bf 100644 --- a/services/applications/sshd.cf +++ b/services/applications/sshd.cf @@ -10,7 +10,7 @@ bundle agent sshd create => "true", edit_defaults => empty, perms => system_owned("444"), - edit_template => "$(sys.inputdir)/templates/sshd/authorized_keys", + edit_template => "$(sys.inputdir)/templates/sshd/authorized_keys.cftpl", classes => if_repaired("sshd_authorized_keys_files_repaired"); classes: freebsd:: diff --git a/services/common.cf b/services/common.cf index ebc3a5f..d315c6a 100644 --- a/services/common.cf +++ b/services/common.cf @@ -5,7 +5,7 @@ bundle agent common "/etc/hosts" edit_defaults => std_defs, perms => system_owned("444"), - copy_from => local_dcp("$(sys.inputdir)/templates/common/hosts"), + copy_from => local_dcp("$(sys.inputdir)/templates/common/hosts.cftpl"), classes => if_repaired("common_hosts_files_repaired"); reports: any:: diff --git a/templates/cfengine/cfengine_watchdog b/templates/cfengine/cfengine_watchdog.cftpl index a998511..a998511 100644 --- a/templates/cfengine/cfengine_watchdog +++ b/templates/cfengine/cfengine_watchdog.cftpl diff --git a/templates/check_mk/check_mk_agent.freebsd b/templates/check_mk/check_mk_agent.freebsd.cftpl index cd20993..cd20993 100644 --- a/templates/check_mk/check_mk_agent.freebsd +++ b/templates/check_mk/check_mk_agent.freebsd.cftpl diff --git a/templates/common/hosts b/templates/common/hosts.cftpl index 23342fd..23342fd 100644 --- a/templates/common/hosts +++ b/templates/common/hosts.cftpl diff --git a/templates/nginx/nagios_htpasswd b/templates/nginx/nagios_htpasswd.cftpl index 31e01ed..31e01ed 100644 --- a/templates/nginx/nagios_htpasswd +++ b/templates/nginx/nagios_htpasswd.cftpl diff --git a/templates/sshd/authorized_keys b/templates/sshd/authorized_keys.cftpl index d3f7f5a..d3f7f5a 100644 --- a/templates/sshd/authorized_keys +++ b/templates/sshd/authorized_keys.cftpl @@ -12,10 +12,8 @@ bundle agent main vars: any:: "input_name_patterns" slist => { - "authorized_keys", - "cf_promises_release_id", - ".*templates.*", ".*\.cf", + ".*\.cftpl", ".*\.dat", ".*\.txt", ".*\.cfg", @@ -81,6 +79,8 @@ body copy_from secure_cp(from) compare => "digest"; encrypt => "true"; verify => "true"; + copy_backup => "false"; + purge => "true"; !am_policy_hub:: servers => { "$(sys.policy_hub)" }; portnumber => "$(sys.policy_hub_port)"; |