From 5e1e138ff4583812b0178d6e610437009bedda2a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 21 Nov 2016 06:58:18 +0100
Subject: [PATCH] plugin: name by underlying system, not surfacing service

IPFW and PF are used for more than just firewall and shaper, e.g.
NAT, policy routing or shaping, and the plugin framework supports
registering multiple user-facing services per file.
---
 src/etc/inc/plugins.inc.d/{shaper.inc => ipfw.inc} | 3 ++-
 src/etc/inc/plugins.inc.d/{firewall.inc => pf.inc} | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename src/etc/inc/plugins.inc.d/{shaper.inc => ipfw.inc} (98%)
 rename src/etc/inc/plugins.inc.d/{firewall.inc => pf.inc} (98%)

diff --git a/src/etc/inc/plugins.inc.d/shaper.inc b/src/etc/inc/plugins.inc.d/ipfw.inc
similarity index 98%
rename from src/etc/inc/plugins.inc.d/shaper.inc
rename to src/etc/inc/plugins.inc.d/ipfw.inc
index bb4d1b777..78e946a62 100644
--- a/src/etc/inc/plugins.inc.d/shaper.inc
+++ b/src/etc/inc/plugins.inc.d/ipfw.inc
@@ -27,9 +27,10 @@
 */
 
 
-function shaper_services()
+function ipfw_services()
 {
     global $config;
+
     $services = array();
 
     if (!empty($config['OPNsense']['TrafficShaper']['rules']['rule'])) {
diff --git a/src/etc/inc/plugins.inc.d/firewall.inc b/src/etc/inc/plugins.inc.d/pf.inc
similarity index 98%
rename from src/etc/inc/plugins.inc.d/firewall.inc
rename to src/etc/inc/plugins.inc.d/pf.inc
index c7c8196b3..b4e41a0aa 100644
--- a/src/etc/inc/plugins.inc.d/firewall.inc
+++ b/src/etc/inc/plugins.inc.d/pf.inc
@@ -26,7 +26,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-function firewall_services()
+function pf_services()
 {
     global $config;