vpn: split up legacy VPN into individual ACL/menu parts

src/opnsense/mvc/app/models/OPNsense/LegacyVPN/ACL/ACL.xml → src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml

 <acl>
     <!-- unique acl key, must be globally unique for all acl's  -->
-    <page-diagnostics-logs-pptp>
-        <name>WebCfg - Diagnostics: Logs: PPTP page</name>
-        <description>Allow access to the 'Diagnostics: Logs: PPTP' page.</description>
-        <patterns>
-            <pattern>diag_logs_pptp.php*</pattern>
-        </patterns>
-    </page-diagnostics-logs-pptp>
-    <page-diagnostics-logs-poes>
-        <name>WebCfg - Diagnostics: Logs: PPPoE page</name>
-        <description>Allow access to the 'Diagnostics: Logs: PPPoE' page.</description>
-        <patterns>
-            <pattern>diag_logs_poes.php*</pattern>
-        </patterns>
-    </page-diagnostics-logs-poes>
     <page-diagnostics-logs-l2tp>
         <name>WebCfg - Diagnostics: Logs: L2TP page</name>
         <description>Allow access to the 'Diagnostics: Logs: L2TP' page.</description>
@@ -42,39 +28,4 @@
             <pattern>vpn_l2tp_users.php*</pattern>
         </patterns>
     </page-vpn-vpnl2tp-users>
-    <page-services-pppoeserver>
-        <name>WebCfg - Services: PPPoE Server page</name>
-        <description>Allow access to the 'Services: PPPoE Server' page.</description>
-        <patterns>
-            <pattern>vpn_pppoe.php*</pattern>
-        </patterns>
-    </page-services-pppoeserver>
-    <page-services-pppoeserver-edit>
-        <name>WebCfg - Services: PPPoE Server: Edit page</name>
-        <description>Allow access to the 'Services: PPPoE Server: Edit' page.</description>
-        <patterns>
-            <pattern>vpn_pppoe_edit.php*</pattern>
-        </patterns>
-    </page-services-pppoeserver-edit>
-    <page-vpn-vpnpptp>
-        <name>WebCfg - VPN: PPTP page</name>
-        <description>Allow access to the 'VPN: PPTP' page.</description>
-        <patterns>
-            <pattern>vpn_pptp.php*</pattern>
-        </patterns>
-    </page-vpn-vpnpptp>
-    <page-vpn-vpnpptp-user-edit>
-        <name>WebCfg - VPN: PPTP: User: Edit page</name>
-        <description>Allow access to the 'VPN: PPTP: User: Edit' page.</description>
-        <patterns>
-            <pattern>vpn_pptp_users_edit.php*</pattern>
-        </patterns>
-    </page-vpn-vpnpptp-user-edit>
-    <page-vpn-vpnpptp-users>
-        <name>WebCfg - VPN: PPTP: Users page</name>
-        <description>Allow access to the 'VPN: PPTP: Users' page.</description>
-        <patterns>
-            <pattern>vpn_pptp_users.php*</pattern>
-        </patterns>
-    </page-vpn-vpnpptp-users>
 </acl>

src/opnsense/mvc/app/models/OPNsense/LegacyVPN/Menu/Menu.xml → src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml

@@ -9,22 +9,5 @@
                 <Type url="/diag_logs_l2tp.php*" visibility="hidden"/>
             </LogFile>
         </L2TP>
-        <PPPoE cssClass="fa fa-tty fa-fw" order="110">
-            <Settings order="10" url="/vpn_pppoe.php">
-                <Edit url="/vpn_pppoe_edit.php*" visibility="hidden"/>
-            </Settings>
-            <LogFile order="20" VisibleName="Log File" url="/diag_logs_poes.php">
-                <Type url="/diag_logs_poes.php*" visibility="hidden"/>
-            </LogFile>
-        </PPPoE>
-        <PPTP cssClass="fa fa-unlock fa-fw" order="120">
-            <Settings order="10" url="/vpn_pptp.php"/>
-            <Users order="20" url="/vpn_pptp_users.php">
-                <Edit url="/vpn_pptp_users_edit.php*" visibility="hidden"/>
-            </Users>
-            <LogFile order="30" VisibleName="Log File" url="/diag_logs_pptp.php">
-                <Type url="/diag_logs_pptp.php*" visibility="hidden"/>
-            </LogFile>
-        </PPTP>
     </VPN>
 </menu>

src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml

+<acl>
+    <!-- unique acl key, must be globally unique for all acl's  -->
+    <page-diagnostics-logs-poes>
+        <name>WebCfg - Diagnostics: Logs: PPPoE page</name>
+        <description>Allow access to the 'Diagnostics: Logs: PPPoE' page.</description>
+        <patterns>
+            <pattern>diag_logs_poes.php*</pattern>
+        </patterns>
+    </page-diagnostics-logs-poes>
+    <page-services-pppoeserver>
+        <name>WebCfg - Services: PPPoE Server page</name>
+        <description>Allow access to the 'Services: PPPoE Server' page.</description>
+        <patterns>
+            <pattern>vpn_pppoe.php*</pattern>
+        </patterns>
+    </page-services-pppoeserver>
+    <page-services-pppoeserver-edit>
+        <name>WebCfg - Services: PPPoE Server: Edit page</name>
+        <description>Allow access to the 'Services: PPPoE Server: Edit' page.</description>
+        <patterns>
+            <pattern>vpn_pppoe_edit.php*</pattern>
+        </patterns>
+    </page-services-pppoeserver-edit>
+</acl>

src/opnsense/mvc/app/models/OPNsense/PPPoE/Menu/Menu.xml

+<menu>
+    <VPN>
+        <PPPoE cssClass="fa fa-tty fa-fw" order="110">
+            <Settings order="10" url="/vpn_pppoe.php">
+                <Edit url="/vpn_pppoe_edit.php*" visibility="hidden"/>
+            </Settings>
+            <LogFile order="20" VisibleName="Log File" url="/diag_logs_poes.php">
+                <Type url="/diag_logs_poes.php*" visibility="hidden"/>
+            </LogFile>
+        </PPPoE>
+    </VPN>
+</menu>

src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml

+<acl>
+    <!-- unique acl key, must be globally unique for all acl's  -->
+    <page-diagnostics-logs-pptp>
+        <name>WebCfg - Diagnostics: Logs: PPTP page</name>
+        <description>Allow access to the 'Diagnostics: Logs: PPTP' page.</description>
+        <patterns>
+            <pattern>diag_logs_pptp.php*</pattern>
+        </patterns>
+    </page-diagnostics-logs-pptp>
+    <page-vpn-vpnpptp>
+        <name>WebCfg - VPN: PPTP page</name>
+        <description>Allow access to the 'VPN: PPTP' page.</description>
+        <patterns>
+            <pattern>vpn_pptp.php*</pattern>
+        </patterns>
+    </page-vpn-vpnpptp>
+    <page-vpn-vpnpptp-user-edit>
+        <name>WebCfg - VPN: PPTP: User: Edit page</name>
+        <description>Allow access to the 'VPN: PPTP: User: Edit' page.</description>
+        <patterns>
+            <pattern>vpn_pptp_users_edit.php*</pattern>
+        </patterns>
+    </page-vpn-vpnpptp-user-edit>
+    <page-vpn-vpnpptp-users>
+        <name>WebCfg - VPN: PPTP: Users page</name>
+        <description>Allow access to the 'VPN: PPTP: Users' page.</description>
+        <patterns>
+            <pattern>vpn_pptp_users.php*</pattern>
+        </patterns>
+    </page-vpn-vpnpptp-users>
+</acl>

src/opnsense/mvc/app/models/OPNsense/PPTP/Menu/Menu.xml

+<menu>
+    <VPN>
+        <PPTP cssClass="fa fa-unlock fa-fw" order="120">
+            <Settings order="10" url="/vpn_pptp.php"/>
+            <Users order="20" url="/vpn_pptp_users.php">
+                <Edit url="/vpn_pptp_users_edit.php*" visibility="hidden"/>
+            </Users>
+            <LogFile order="30" VisibleName="Log File" url="/diag_logs_pptp.php">
+                <Type url="/diag_logs_pptp.php*" visibility="hidden"/>
+            </LogFile>
+        </PPTP>
+    </VPN>
+</menu>