From dc353d4860f06906003fa96de2ff3063c1bd5ffb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 22 Nov 2017 08:50:54 +0100
Subject: [PATCH] openvpn: move internal script file to plugin location

---
 plist                                          |  2 +-
 src/etc/inc/plugins.inc.d/openvpn.inc          | 18 ++++++++++--------
 .../inc/plugins.inc.d/openvpn/attributes.sh}   |  0
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename src/{sbin/openvpn.attributes.sh => etc/inc/plugins.inc.d/openvpn/attributes.sh} (100%)

diff --git a/plist b/plist
index ecee69a1e..0d24a4260 100644
--- a/plist
+++ b/plist
@@ -40,6 +40,7 @@
 /usr/local/etc/inc/plugins.inc.d/ntpd.inc
 /usr/local/etc/inc/plugins.inc.d/openssh.inc
 /usr/local/etc/inc/plugins.inc.d/openvpn.inc
+/usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh
 /usr/local/etc/inc/plugins.inc.d/openvpn/auth-user.php
 /usr/local/etc/inc/plugins.inc.d/openvpn/tls-verify.php
 /usr/local/etc/inc/plugins.inc.d/openvpn/wizard.inc
@@ -922,7 +923,6 @@
 /usr/local/sbin/dhclient-script.ext
 /usr/local/sbin/mpd.script
 /usr/local/sbin/ntpdate_sync_once.sh
-/usr/local/sbin/openvpn.attributes.sh
 /usr/local/sbin/opnsense-auth
 /usr/local/sbin/opnsense-importer
 /usr/local/sbin/opnsense-installer
diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 0abf4a731..60420bc77 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -564,6 +564,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
             }
             break;
     }
+
     $conf .= "dev-node /dev/{$tunname}\n";
     $conf .= "writepid /var/run/openvpn_{$mode_id}.pid\n";
     $conf .= "#user nobody\n";
@@ -579,14 +580,15 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
     $conf .= "auth {$digest}\n";
     $conf .= "up /usr/local/sbin/ovpn-linkup\n";
     $conf .= "down /usr/local/sbin/ovpn-linkdown\n";
-    if (file_exists("/usr/local/sbin/openvpn.attributes.sh")) {
-        switch($settings['mode']) {
-            case 'server_user':
-            case 'server_tls_user':
-                $conf .= "client-connect /usr/local/sbin/openvpn.attributes.sh\n";
-                $conf .= "client-disconnect /usr/local/sbin/openvpn.attributes.sh\n";
-                break;
-        }
+
+    switch($settings['mode']) {
+        case 'server_user':
+        case 'server_tls_user':
+            $conf .= "client-connect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
+            $conf .= "client-disconnect /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh\n";
+            break;
+        default:
+            break;
     }
 
     if (!empty($iface_ip)) {
diff --git a/src/sbin/openvpn.attributes.sh b/src/etc/inc/plugins.inc.d/openvpn/attributes.sh
similarity index 100%
rename from src/sbin/openvpn.attributes.sh
rename to src/etc/inc/plugins.inc.d/openvpn/attributes.sh