summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorJulien Dessaux2018-03-14 15:19:07 +0100
committerJulien Dessaux2018-03-14 15:19:07 +0100
commitda8598dd622df36f853b32782e8c9756d2a4e787 (patch)
tree2862d6a09ba81a5fbec157ce84294333a3b10bc6 /services
parentAdded rutorrent docker container to /etc/hosts (diff)
downloadmasterfiles-da8598dd622df36f853b32782e8c9756d2a4e787.tar.gz
masterfiles-da8598dd622df36f853b32782e8c9756d2a4e787.tar.bz2
masterfiles-da8598dd622df36f853b32782e8c9756d2a4e787.zip
Fixed update.cf problem no copying all template files
Diffstat (limited to '')
-rw-r--r--services/applications/check_mk.cf2
-rw-r--r--services/applications/nagios.cf2
-rw-r--r--services/applications/sshd.cf2
-rw-r--r--services/common.cf2
4 files changed, 4 insertions, 4 deletions
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::