netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

sysutils/puppet-agent: add runinterval and runtimeout

Browse Source
This commit is contained in:
Frank Wall
2023-01-18 00:00:13 +01:00
parent 9d8f6704ff
commit ed0e8f9487
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/puppet-agent/pkg-descr
+3
View File
@@ -9,6 +9,9 @@ WWW: https://puppet.com/docs/puppet/latest/man/agent.html
Plugin Changelog
================
Added:
* add new options runinterval and runtimeout
Changed:
* add default values for Puppet Server + Environment
sysutils/puppet-agent/src/opnsense/mvc/app/controllers/OPNsense/PuppetAgent/forms/general.xml
+12
View File
@@ -17,4 +17,16 @@
<type>text</type>
<help>Change Puppet Agent Environment</help>
</field>
<field>
<id>puppetagent.general.RunInterval</id>
<label>Run Interval</label>
<type>text</type>
<help>How often Puppet Agent applies the catalog. Enter a number followed by one of the supported suffixes: "y" (years), "d" (days), "h" (hours), "m" (minutes), "s" (seconds).</help>
</field>
<field>
<id>puppetagent.general.RunTimeout</id>
<label>Run Timeout</label>
<type>text</type>
<help>The maximum amount of time an agent run is allowed to take. Enter a number followed by one of the supported suffixes: "y" (years), "d" (days), "h" (hours), "m" (minutes), "s" (seconds).</help>
</field>
</form>
sysutils/puppet-agent/src/opnsense/mvc/app/models/OPNsense/PuppetAgent/PuppetAgent.xml
+12
View File
@@ -18,6 +18,18 @@
<mask>/^.{1,100}$/u</mask>
<ValidationMessage>Should be a string between 1 and 100 characters.</ValidationMessage>
</Environment>
<RunInterval type="TextField">
<default>30m</default>
<mask>/^([0-9]{1,8}(?:s|m|h|d|y)?)/u</mask>
<ValidationMessage>Should be a number between 1 and 8 characters, optionally followed by either "y", "d", "h", "m" or "s".</ValidationMessage>
<Required>Y</Required>
</RunInterval>
<RunTimeout type="TextField">
<default>1h</default>
<mask>/^([0-9]{1,8}(?:s|m|h|d|y)?)/u</mask>
<ValidationMessage>Should be a number between 1 and 8 characters, optionally followed by either "y", "d", "h", "m" or "s".</ValidationMessage>
<Required>Y</Required>
</RunTimeout>
</general>
</items>
</model>
sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf
+6
View File
@@ -3,6 +3,12 @@
certname = {{ system.hostname|lower }}.{{ system.domain|lower }}
server = {{ OPNsense.puppetagent.general.FQDN|default("") }}
logdest = /var/log/puppet-agent.log
{% if OPNsense.puppetagent.general.RunInterval|default("") != "" %}
runinterval = {{ OPNsense.puppetagent.general.RunInterval }}
{% endif %}
{% if OPNsense.puppetagent.general.RunTimeout|default("") != "" %}
runtimeout = {{ OPNsense.puppetagent.general.RunTimeout}}
{% endif %}
{% if helpers.exists('OPNsense.puppetagent.general') and not helpers.empty('OPNsense.puppetagent.general.Environment') %}
[agent]
environment = {{ OPNsense.puppetagent.general.Environment|default("") }}