From 0ce92100d994d100ee835ac923eea672bb8b8d8f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 14 Sep 2018 15:34:51 +0200
Subject: [PATCH] net/vnstat: post-merge drama

---
 README.md                                                     | 1 +
 .../app/controllers/OPNsense/Vnstat/Api/ServiceController.php | 2 +-
 .../src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt   | 4 ++--
 net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh

diff --git a/README.md b/README.md
index e8d349d06..4f588d96e 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ net/relayd -- Relayd Load Balancer
 net/shadowsocks -- Secure socks5 proxy
 net/siproxd -- Siproxd is a proxy daemon for the SIP protocol
 net/upnp -- Universal Plug and Play Service
+net/vnstat -- vnStat is a console-based network traffic monitor
 net/wireguard -- WireGuard VPN service
 net/wol -- Wake on LAN Service
 net/zerotier -- Virtual Networks That Just Work
diff --git a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php
index b56052885..b8e98e70d 100644
--- a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php
+++ b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php
@@ -44,7 +44,7 @@ class ServiceController extends ApiMutableServiceControllerBase
     static protected $internalServiceTemplate = 'OPNsense/Vnstat';
     static protected $internalServiceEnabled = 'enabled';
     static protected $internalServiceName = 'vnstat';
-    
+
     /**
      * list hourly statistics
      * @return array
diff --git a/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt b/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt
index a6e5e38c6..e183bde12 100644
--- a/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt
+++ b/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt
@@ -62,7 +62,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 <script>
 
-// Put API call into a function, needed for auto-refresh    
+// Put API call into a function, needed for auto-refresh
 function update_hourly() {
     ajaxCall(url="/api/vnstat/service/hourly", sendData={}, callback=function(data,status) {
         $("#listhourly").text(data['response']);
@@ -100,7 +100,7 @@ $( document ).ready(function() {
     setInterval(update_daily, 3000);
     setInterval(update_weekly, 3000);
     setInterval(update_monthly, 3000);
-    
+
     $("#saveAct").click(function(){
         saveFormToEndpoint(url="/api/vnstat/general/set", formid='frm_general_settings',callback_ok=function(){
         $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
diff --git a/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh b/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
old mode 100644
new mode 100755
index a43d0ada2..02d682ad7
--- a/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
+++ b/net/vnstat/src/opnsense/scripts/OPNsense/Vnstat/setup.sh
@@ -6,4 +6,4 @@ chmod 755 /var/run/vnstat
 
 mkdir -p /var/lib/vnstat
 chown -R vnstat:vnstat /var/lib/vnstat
-chmod 755 /var/lib/vnstat
\ No newline at end of file
+chmod 755 /var/lib/vnstat