From 5626cc1e8fab8c623ac15b89d9c31ad562cec9fc Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 7 Sep 2018 17:05:16 +0200
Subject: [PATCH] net/ntopng: post-merge amendments

---
 README.md                                                       | 1 +
 net/ntopng/src/etc/inc/plugins.inc.d/ntopng.inc                 | 2 +-
 .../app/controllers/OPNsense/Ntopng/Api/ServiceController.php   | 2 +-
 net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh        | 2 +-
 .../src/opnsense/service/templates/OPNsense/Ntopng/+TARGETS     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh

diff --git a/README.md b/README.md
index a4578871f..e8d349d06 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ net/haproxy -- Reliable, high performance TCP/HTTP load balancer
 net/igmp-proxy -- IGMP-Proxy Service
 net/l2tp -- L2TP server based on MPD5
 net/mdns-repeater -- Proxy multicast DNS between networks
+net/ntopng -- Traffic Analysis and Flow Collection
 net/pppoe -- PPPoE server based on MPD5
 net/pptp -- PPTP server based on MPD5
 net/quagga -- End of life, superseded by FRR plugin
diff --git a/net/ntopng/src/etc/inc/plugins.inc.d/ntopng.inc b/net/ntopng/src/etc/inc/plugins.inc.d/ntopng.inc
index e75bd79bd..4768bedea 100644
--- a/net/ntopng/src/etc/inc/plugins.inc.d/ntopng.inc
+++ b/net/ntopng/src/etc/inc/plugins.inc.d/ntopng.inc
@@ -52,4 +52,4 @@ function ntopng_services()
     );
 
     return $services;
-}
\ No newline at end of file
+}
diff --git a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php
index 3eeaf8f6d..f21d3a9a5 100644
--- a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php
+++ b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php
@@ -44,7 +44,7 @@ class ServiceController extends ApiMutableServiceControllerBase
     static protected $internalServiceTemplate = 'OPNsense/Ntopng';
     static protected $internalServiceEnabled = 'enabled';
     static protected $internalServiceName = 'ntopng';
-    
+
     /**
      * check if Redis plugin is installed
      * @return array
diff --git a/net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh b/net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh
old mode 100644
new mode 100755
index 271b423d2..41fb211a3
--- a/net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh
+++ b/net/ntopng/src/opnsense/scripts/OPNsense/Ntopng/setup.sh
@@ -6,4 +6,4 @@ chown ntopng:ntopng /var/run/ntopng
 
 mkdir -p /var/tmp/ntopng/
 chmod 755 /var/tmp/ntopng
-chown ntopng:wheel /var/tmp/ntopng
\ No newline at end of file
+chown ntopng:wheel /var/tmp/ntopng
diff --git a/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/+TARGETS b/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/+TARGETS
index e9da94274..ed270077e 100644
--- a/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/+TARGETS
+++ b/net/ntopng/src/opnsense/service/templates/OPNsense/Ntopng/+TARGETS
@@ -1,2 +1,2 @@
 ntopng:/etc/rc.conf.d/ntopng
-ntopng.conf:/usr/local/etc/ntopng.conf
\ No newline at end of file
+ntopng.conf:/usr/local/etc/ntopng.conf