From e845256b1ad1143207de6b03eae22efcb66ad558 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 20 May 2020 06:11:29 +0200
Subject: [PATCH] stunnel: minor bug fixes

- used wrong pid for ident status
- reload syslog on service start
- missing condition in syslog template (hence the service reload)

for https://github.com/opnsense/plugins/issues/1829
---
 .../src/etc/inc/plugins.inc.d/stunnel.inc       |  4 ++--
 .../service/conf/actions.d/actions_stunnel.conf | 17 ++++++++++++++---
 .../templates/OPNsense/Stunnel/rc.conf.d        |  1 +
 .../Stunnel/syslog-ng-stunnel-ident.conf        |  4 ++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc b/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
index faa26282e..335e70802 100644
--- a/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
+++ b/security/stunnel/src/etc/inc/plugins.inc.d/stunnel.inc
@@ -52,13 +52,13 @@ function stunnel_services()
             // only report status from identd seperately, control is combined with stunnel
             $services[] = array(
                 'description' => gettext('Identd (stunnel)'),
-                'stunnel' => array(
+                'identd_stunnel' => array(
                     'restart' => array('stunnel restart'),
                     'start' => array('stunnel start'),
                     'stop' => array('stunnel stop'),
                 ),
                 'name' => 'identd_stunnel',
-                'pidfile' => '/var/run/stunnel_identd.pid',
+                'pidfile' => '/var/run/identd_stunnel.pid',
             );
         }
     }
diff --git a/security/stunnel/src/opnsense/service/conf/actions.d/actions_stunnel.conf b/security/stunnel/src/opnsense/service/conf/actions.d/actions_stunnel.conf
index e0dc8de69..2ab897d8d 100644
--- a/security/stunnel/src/opnsense/service/conf/actions.d/actions_stunnel.conf
+++ b/security/stunnel/src/opnsense/service/conf/actions.d/actions_stunnel.conf
@@ -5,19 +5,30 @@ type:script_output
 message:List SSL ciphers
 
 [start]
-command:/usr/local/etc/rc.d/stunnel start; /usr/local/etc/rc.d/identd_stunnel start; exit 0
+command:
+  /usr/local/etc/rc.d/stunnel start;
+  /usr/local/etc/rc.d/identd_stunnel start;
+  /usr/local/etc/rc.d/syslog-ng reload;
+  exit 0
 parameters:
 type:script
 message:stunnel service start
 
 [stop]
-command:/usr/local/etc/rc.d/stunnel stop; /usr/local/etc/rc.d/identd_stunnel stop; exit 0
+command:
+    /usr/local/etc/rc.d/stunnel stop;
+    /usr/local/etc/rc.d/identd_stunnel stop;
+    exit 0
 parameters:
 type:script
 message:stunnel service stop
 
 [restart]
-command:/usr/local/etc/rc.d/stunnel restart; /usr/local/etc/rc.d/identd_stunnel restart; exit 0
+command:
+    /usr/local/etc/rc.d/stunnel restart;
+    /usr/local/etc/rc.d/identd_stunnel restart;
+    /usr/local/etc/rc.d/syslog-ng reload;
+    exit 0
 parameters:
 type:script
 message:stunnel service restart
diff --git a/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/rc.conf.d b/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/rc.conf.d
index 9c3da50ff..80fccca16 100644
--- a/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/rc.conf.d
+++ b/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/rc.conf.d
@@ -8,6 +8,7 @@ chown -R stunnel:stunnel /var/run/stunnel
 chmod -R 700 /var/run/stunnel
 
 /usr/local/opnsense/scripts/stunnel/generate_certs.php > /dev/null 2>&1
+
 {% else %}
 stunnel_enable="NO"
 {% endif %}
diff --git a/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/syslog-ng-stunnel-ident.conf b/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/syslog-ng-stunnel-ident.conf
index 7e9c4b723..4bb708db2 100644
--- a/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/syslog-ng-stunnel-ident.conf
+++ b/security/stunnel/src/opnsense/service/templates/OPNsense/Stunnel/syslog-ng-stunnel-ident.conf
@@ -1,3 +1,5 @@
+{% if not helpers.empty('OPNsense.Stunnel.general.enabled') and
+      not helpers.empty('OPNsense.Stunnel.general.enable_ident_server') %}
 destination d_stunnel_ident {
     file(
         "/var/run/stunnel/logs/stunnel_ident_${YEAR}${MONTH}${DAY}.log"
@@ -20,3 +22,5 @@ log {
     filter(f_stunnel_ident);
     destination(d_stunnel_ident);
 };
+
+{% endif %}