From f825a0a503895a98ff8672b91531e7acd02f2b95 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Tue, 21 Mar 2017 17:20:13 +0100
Subject: [PATCH] Some updates to quagga package (#92)

* Added zebra.conf

Added zebra.conf since quagga wont start without zebra

* Added zebra.conf

Added zebra.conf since Quagga wont start without zebra

* Changed OSPF to Quagga

This is general, not OSPF itself

* Changed ospf to bgp

Changed ospf to bgp

* Changed ospf to isis

Changed ospf to isis

* Changed ospf to rip

Changed ospf to rip

* Added help to network.area

Added help to network.area

* Removed OSPF related configuration

Doesn't make sense here
---
 .../app/controllers/OPNsense/Quagga/forms/bgp.xml  |  2 +-
 .../Quagga/forms/dialogEditOSPFNetwork.xml         |  1 +
 .../app/controllers/OPNsense/Quagga/forms/isis.xml |  2 +-
 .../app/controllers/OPNsense/Quagga/forms/rip.xml  |  2 +-
 .../mvc/app/models/OPNsense/Quagga/General.xml     |  2 +-
 .../service/templates/OPNsense/Quagga/+TARGETS     |  1 +
 .../service/templates/OPNsense/Quagga/zebra.conf   | 14 ++++++++++++++
 7 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf

diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index 2cb5a7037..194badc6d 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -3,6 +3,6 @@
         <id>routing.bgp.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the bgp service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
index a7a81c9d8..eb4f548a7 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
@@ -18,5 +18,6 @@
     <id>network.area</id>
     <label>Area</label>
     <type>text</type>
+    <help>Area in wildcard mask style like 0.0.0.0 and no decimal 0</help>
   </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
index 8989507a5..bf188c45c 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
@@ -3,6 +3,6 @@
         <id>routing.isis.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the isis service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
index 7adf10562..729a5fe53 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
@@ -3,6 +3,6 @@
         <id>routing.rip.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the rip service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
index 3d9d25eb2..31bb3778f 100644
--- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
+++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/quagga/general</mount>
-    <description>OSPF Routing configuration</description>
+    <description>Quagga Routing configuration</description>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
index 49745db1b..17356eed7 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
@@ -1,2 +1,3 @@
 ospfd.conf:/usr/local/etc/quagga/ospfd.conf
 quagga:/etc/rc.conf.d/quagga
+zebra.conf:/usr/local/etc/quagga/zebra.conf
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
new file mode 100644
index 000000000..1ee6ba8f6
--- /dev/null
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
@@ -0,0 +1,14 @@
+!
+! Zebra configuration saved from vty
+!   2017/03/03 20:21:04
+!
+!
+!
+!
+!
+ip forwarding
+ipv6 forwarding
+!
+!
+line vty
+!