From 4b99ff9f025bd3454fd19edf347327860c9960c8 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 21 Nov 2016 23:14:18 +0100
Subject: [PATCH] wake on lan: acl and menu

---
 plist                                            |  2 ++
 .../mvc/app/models/OPNsense/Base/Menu/Menu.xml   |  4 ----
 .../mvc/app/models/OPNsense/Core/ACL/ACL.xml     | 14 --------------
 .../mvc/app/models/OPNsense/WOL/ACL/ACL.xml      | 16 ++++++++++++++++
 .../mvc/app/models/OPNsense/WOL/Menu/Menu.xml    |  8 ++++++++
 5 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
 create mode 100644 src/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml

diff --git a/plist b/plist
index ec189c317..47d86a614 100644
--- a/plist
+++ b/plist
@@ -468,6 +468,8 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/UPnP/Menu/Menu.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index d1bb4c83c..a4bcf14f0 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -255,10 +255,6 @@
             <Lookup order="40" url="/diag_dns.php"/>
             <LogFile order="100" VisibleName="Log File" url="/diag_logs_resolver.php"/>
         </DNSTools>
-        <WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off fa-fw">
-            <WoLEdit url="/services_wol_edit.php*" visibility="hidden"/>
-            <Wol url="/services_wol.php*" visibility="hidden"/>
-        </WoL>
         <Diagnostics order="900" cssClass="fa fa-medkit fa-fw" url="/status_services.php">
           <All url="/status_services.php?*" visibility="hidden"/>
         </Diagnostics>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index 3fd03834c..ab7da23ba 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -658,20 +658,6 @@
             <pattern>services_router_advertisements.php*</pattern>
         </patterns>
     </page-services-router-advertisements>
-    <page-services-wakeonlan>
-        <name>WebCfg - Services: Wake on LAN page</name>
-        <description>Allow access to the 'Services: Wake on LAN' page.</description>
-        <patterns>
-            <pattern>services_wol.php*</pattern>
-        </patterns>
-    </page-services-wakeonlan>
-    <page-services-wakeonlan-edit>
-        <name>WebCfg - Services: Wake on LAN: Edit page</name>
-        <description>Allow access to the 'Services: Wake on LAN: Edit' page.</description>
-        <patterns>
-            <pattern>services_wol_edit.php*</pattern>
-        </patterns>
-    </page-services-wakeonlan-edit>
     <page-status-carp>
         <name>WebCfg - Status: CARP page</name>
         <description>Allow access to the 'Status: CARP' page.</description>
diff --git a/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
new file mode 100644
index 000000000..de2f9039a
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
@@ -0,0 +1,16 @@
+<acl>
+    <page-services-wakeonlan>
+        <name>WebCfg - Services: Wake on LAN page</name>
+        <description>Allow access to the 'Services: Wake on LAN' page.</description>
+        <patterns>
+            <pattern>services_wol.php*</pattern>
+        </patterns>
+    </page-services-wakeonlan>
+    <page-services-wakeonlan-edit>
+        <name>WebCfg - Services: Wake on LAN: Edit page</name>
+        <description>Allow access to the 'Services: Wake on LAN: Edit' page.</description>
+        <patterns>
+            <pattern>services_wol_edit.php*</pattern>
+        </patterns>
+    </page-services-wakeonlan-edit>
+</acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml
new file mode 100644
index 000000000..5f0df9a6b
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml
@@ -0,0 +1,8 @@
+<menu>
+    <Services>
+        <WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off fa-fw">
+            <WoLEdit url="/services_wol_edit.php*" visibility="hidden"/>
+            <Wol url="/services_wol.php*" visibility="hidden"/>
+        </WoL>
+    </Services>
+</menu>