From c65e7e19cb4e7328e49f600f25de36795e6ba694 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Tue, 20 Mar 2018 17:06:29 +0100 Subject: Cleaned useless template expansions --- services/applications/nrpe.cf | 2 +- services/applications/openvpn.cf | 2 +- services/applications/php56.cf | 2 +- services/applications/sshd.cf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/applications/nrpe.cf b/services/applications/nrpe.cf index f2a4c3f..c5ed6f8 100644 --- a/services/applications/nrpe.cf +++ b/services/applications/nrpe.cf @@ -16,7 +16,7 @@ bundle agent nrpe create => "true", edit_defaults => empty, perms => system_owned("444"), - edit_template => "$(sys.inputdir)/templates/nrpe/nrpe.cfg", + copy_from => local_dcp("$(sys.inputdir)/templates/nrpe/nrpe.cfg"), classes => if_repaired("nrpe_nrpe_cfg_file_repaired"); classes: freebsd.nrpe:: diff --git a/services/applications/openvpn.cf b/services/applications/openvpn.cf index 963c720..c76c18d 100644 --- a/services/applications/openvpn.cf +++ b/services/applications/openvpn.cf @@ -9,7 +9,7 @@ bundle agent openvpn create => "true", edit_defaults => empty, perms => system_owned("440"), - edit_template => "$(sys.inputdir)/templates/openvpn/common.key.cftpl", + copy_from => local_dcp("$(sys.inputdir)/templates/openvpn/common.key.cftpl"), classes => if_repaired("openvpn_common_key_repaired"); methods: any:: diff --git a/services/applications/php56.cf b/services/applications/php56.cf index d16870c..99e76a7 100644 --- a/services/applications/php56.cf +++ b/services/applications/php56.cf @@ -17,7 +17,7 @@ bundle agent php56 create => "true", edit_defaults => empty, perms => system_owned("444"), - edit_template => "$(sys.inputdir)/templates/php/freebsd-php56-php-fpm.conf", + copy_from => local_dcp("$(sys.inputdir)/templates/php/freebsd-php56-php-fpm.conf"), classes => if_repaired("php56_php_fpm_conf_file_repaired"); "/var/run/php-fpm/." create => "true", diff --git a/services/applications/sshd.cf b/services/applications/sshd.cf index 7cf58bf..d44cbff 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.cftpl", + copy_from => local_dcp("$(sys.inputdir)/templates/sshd/authorized_keys.cftpl"), classes => if_repaired("sshd_authorized_keys_files_repaired"); classes: freebsd:: -- cgit v1.2.3