upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/puppet-agent: don't wipe puppet.conf

Browse source 
While here, improve readability of the template and the resulting puppet.conf.
This commit is contained in:
Frank Wall 2023-01-18 00:20:27 +01:00
parent 07c9c9fe87
commit 5f58842f56
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysutils/puppet-agent/pkg-descr
View file

@ -15,6 +15,7 @@ Added:
Changed:
* add default values for Puppet Server + Environment
* don't wipe puppet.conf if service is disabled
1.0

21
sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf
View file

@ -1,21 +1,20 @@
{% if helpers.exists('OPNsense.puppetagent.general') and OPNsense.puppetagent.general.Enabled|default("0") == "1" %}
[main]
certname = {{ system.hostname|lower }}.{{ system.domain|lower }}
server = {{ OPNsense.puppetagent.general.FQDN|default("") }}
logdest = /var/log/puppet-agent.log
certname = {{ system.hostname|lower }}.{{ system.domain|lower }}
logdest = /var/log/puppet-agent.log
{% if OPNsense.puppetagent.general.RunInterval|default("") != "" %}
runinterval = {{ OPNsense.puppetagent.general.RunInterval }}
runinterval = {{ OPNsense.puppetagent.general.RunInterval }}
{% endif %}
{% if OPNsense.puppetagent.general.RunTimeout|default("") != "" %}
runtimeout = {{ OPNsense.puppetagent.general.RunTimeout}}
runtimeout = {{ OPNsense.puppetagent.general.RunTimeout}}
{% endif %}
server = {{ OPNsense.puppetagent.general.FQDN|default("") }}
{% if OPNsense.puppetagent.general.UseCacheOnFailure|default("0") == "1" %}
usecacheonfailure = true
usecacheonfailure = true
{% else %}
usecacheonfailure = false
usecacheonfailure = false
{% endif %}
{% if helpers.exists('OPNsense.puppetagent.general') and not helpers.empty('OPNsense.puppetagent.general.Environment') %}
[agent]
environment = {{ OPNsense.puppetagent.general.Environment|default("") }}
{% endif %}
{% if not helpers.empty('OPNsense.puppetagent.general.Environment') %}
environment = {{ OPNsense.puppetagent.general.Environment|default("") }}
{% endif %}