From ed7afdb77da7ac3d006498b8f0e7d9f0f942e346 Mon Sep 17 00:00:00 2001
From: spoutin <spoutin@hotmail.com>
Date: Tue, 27 Dec 2022 11:28:21 -0500
Subject: [PATCH] Monit starttimeout (#6213)

---
 .../mvc/app/controllers/OPNsense/Monit/forms/services.xml  | 7 +++++++
 src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml       | 7 +++++++
 src/opnsense/service/templates/OPNsense/Monit/monitrc      | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
index 184f3db2b..c4e13a33e 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/forms/services.xml
@@ -42,6 +42,13 @@
       <advanced>true</advanced>
       <help><![CDATA[The timeout for custom program checks.]]></help>
    </field>
+   <field>
+      <id>service.starttimeout</id>
+      <label>Start Timeout</label>
+      <type>text</type>
+      <advanced>true</advanced>
+      <help><![CDATA[The timeout for custom program to start a service.]]></help>
+   </field>
    <field>
       <id>service.address</id>
       <label>Address</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
index 7c2a8e6ba..393a35f2c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
@@ -231,6 +231,13 @@
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Program Timeout needs to be an integer value between 1 and 86400</ValidationMessage>>
          </timeout>
+         <starttimeout type="IntegerField">
+            <default>30</default>
+            <Required>N</Required>
+            <MinimumValue>0</MinimumValue>
+            <MaximumValue>86400</MaximumValue>
+            <ValidationMessage>Start Delay needs to be an integer value between 0 and 86400</ValidationMessage>
+         </starttimeout>
          <address type="HostnameField">
             <Required>N</Required>
          </address>
diff --git a/src/opnsense/service/templates/OPNsense/Monit/monitrc b/src/opnsense/service/templates/OPNsense/Monit/monitrc
index 1ad26203d..0adbd1896 100644
--- a/src/opnsense/service/templates/OPNsense/Monit/monitrc
+++ b/src/opnsense/service/templates/OPNsense/Monit/monitrc
@@ -135,7 +135,7 @@ check {{ service.type }} {{ service.name }} {{ path }}
 {%      endfor %}
 {%     endif %}
 {%     if service.start|default('') != '' %}
-   start program = "{{ service.start }}"
+   start program = "{{ service.start }}" with timeout {{service.starttimeout|default('30')}} seconds
 {%     endif %}
 {%     if service.stop|default('') != '' %}
    stop program = "{{ service.stop }}"