files: minor improvements to the FunkFeuer configuration files
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 30 Apr 2015 13:57:17 +0000 (15:57 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 1 May 2015 07:38:57 +0000 (09:38 +0200)
Remove the minimal file, it effectively the same as the default
configuration.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
files/olsrd.conf.funkfeuer
files/olsrd.conf.minimal_freifunk [deleted file]

index 8b9b498..b5a0f55 100644 (file)
@@ -1,34 +1,45 @@
 #
-# sourced from: http://wiki.funkfeuer.at/index.php/OLSR-Konfiguration
+# Copied from http://wiki.funkfeuer.at/index.php/OLSR-Konfiguration
 #
+# jsoninfo plugin added to be able to generate the effective configuration
+# file easily
+#
+
+DebugLevel                     0
+IpVersion                      4
+AllowNoInt                     yes
+FIBMetric                      "flat"
+TcRedundancy                   2
+MprCoverage                    5
+LinkQualityFishEye             1
+LinkQualityAlgorithm           "etx_ff"
+LinkQualityLevel               2
+UseHysteresis                  no
 
-DebugLevel              0
-IpVersion               4
-AllowNoInt              yes
-FIBMetric               "flat"
-TcRedundancy            2
-MprCoverage             5
-LinkQualityFishEye      1
-LinkQualityAlgorithm    "etx_ff"  
-LinkQualityLevel 2
-UseHysteresis no
+Interface "wlan0"
+{
+}
 
 LoadPlugin "olsrd_httpinfo.so.0.1"
 {
-       PlParam     "port"   "80"
-       PlParam     "Net"    "0.0.0.0 0.0.0.0"
+    PlParam "port"             "80"
+    PlParam "Net"              "0.0.0.0 0.0.0.0"
+}
+
+LoadPlugin "olsrd_jsoninfo.so.0.0"
+{
 }
 
 #Trage hier deine OLSR-Interfaces (funk, lan, tunnel, etc,..) ein
 InterfaceDefaults
 {
-       Ip4Broadcast 255.255.255.255
-       HelloInterval           5.0
-       HelloValidityTime       100.0
-       TcInterval              3.0
-       TcValidityTime          500.0
-       MidInterval             30.0
-       MidValidityTime         500.0
-       HnaInterval             30.0
-       HnaValidityTime         500.0
-}
+    Ip4Broadcast               255.255.255.255
+    HelloInterval              5.0
+    HelloValidityTime          100.0
+    TcInterval                 3.0
+    TcValidityTime             500.0
+    MidInterval                30.0
+    MidValidityTime            500.0
+    HnaInterval                30.0
+    HnaValidityTime            500.0
+}
\ No newline at end of file
diff --git a/files/olsrd.conf.minimal_freifunk b/files/olsrd.conf.minimal_freifunk
deleted file mode 100644 (file)
index 29f12df..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# OLSR.org routing daemon config file
-#
-# Lines starting with a # are discarded
-#
-
-Interface "wlan0"
-{
-}
-