Merge branch 'experimental'

Unterstütze Geräte mit ath10k Chipsatz durch Konfiguration von GLUON_ATH10K_MESH
Tabs in Leerzeichen konvertiert
2017-07-23 11:09:57 +02:00 · 2017-07-23 10:16:38 +02:00 · 2017-07-23 09:26:00 +02:00 · 2017-07-23 09:19:38 +02:00 · 2017-03-03 21:25:38 +01:00 · 2017-03-03 21:02:58 +01:00
5 changed files with 48 additions and 29 deletions
--- a/3
+++ b/3
@ -1,4 +1,5 @@
 Freifunk Community Pinneberg
 Site-Konfiguration "site-ffpi"

-Dieses ist der Beta-Brach.
+Dieses ist der Stable-Branch.
+
--- a/i18n/de.po
+++ b/i18n/de.po
@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-05-02 08:41+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@ -44,6 +44,9 @@ msgstr ""
 msgid "gluon-luci-node-role:role:node"
 msgstr "Normaler Knoten"

+msgid "gluon-luci-node-role:role:temp"
+msgstr "Knoten nicht 24/7 verfügbar"
+
 msgid "gluon-luci-node-role:role:mobile"
 msgstr "Mobiler Knoten"

@ -55,3 +58,6 @@ msgstr "Knoten für Dienste"

 msgid "gluon-luci-node-role:role:test"
 msgstr "Knoten für Tests"
+
+msgid "gluon-luci-node-role:role:hidden"
+msgstr "Unsichtbarer Knoten"
--- a/i18n/en.po
+++ b/i18n/en.po
@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-05-02 08:41+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: English\n"
 "Language: en\n"
@ -40,6 +40,9 @@ msgstr ""
 msgid "gluon-luci-node-role:role:node"
 msgstr "Normal Node"

+msgid "gluon-luci-node-role:role:temp"
+msgstr "Node not available 24/7"
+
 msgid "gluon-luci-node-role:role:mobile"
 msgstr "Mobile Node"

@ -51,3 +54,6 @@ msgstr "Service Node"

 msgid "gluon-luci-node-role:role:test"
 msgstr "Test Node"
+
+msgid "gluon-luci-node-role:role:hidden"
+msgstr "Hidden Node"
--- a/site.conf
+++ b/site.conf
@ -5,7 +5,7 @@
    opkg = {
        openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
        extra = {
-            modules = 'http://1.download.services.ffpi/beta/modules/gluon-%GS-%GR/%S',
+            modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
        },
    },
    prefix4 = '10.137.0.0/16',
@ -23,24 +23,24 @@
            ssid = '0a:00:ba:dc:ab:1e',
            bssid = '0a:00:ba:dc:ab:1e',
            mcast_rate = 12000
-        },
+        }
    },
    wifi5 = {
        channel = 40,
        htmode = 'HT40+',
-        master = {
+        ap = {
            ssid = 'pinneberg.freifunk.net',
        },
        ibss = {
            ssid = '0a:00:ba:dc:ab:1e',
            bssid = '0a:00:ba:dc:ab:1e',
            mcast_rate = 12000,
-        },
+        }
    },
    next_node = {
        ip4 = '10.137.0.1',
        ip6 = 'fde8:21c6:9d82::1',
-        mac = '16:41:95:40:f7:dc',
+        mac = '16:41:95:40:f7:dc'
    },
    fastd_mesh_vpn = {
        methods = {'salsa2012+umac'},
@ -63,7 +63,6 @@
                            'ipv4 "gate03.hoogi.de" port 10000',
                            'ipv4 "gate03.pinneberg.freifunk.net" port 10000',
                            'ipv4 "gate03.freifunk-pinneberg.de" port 10000'
-
                        },
                    },
                    gate04 = {
@ -79,19 +78,19 @@
                            'ipv4 "gate05.hoogi.de" port 10000',
                            'ipv4 "gate05.pinneberg.freifunk.net" port 10000',
                            'ipv4 "gate05.freifunk-pinneberg.de" port 10000'
-                        },
-                    },
-                },
-            },
+                        }
+                    }
+                }
+            }
        },
        bandwidth_limit = {
            enabled = false,
            limit_ingress = 3000,
-            limit_egress = 200,
+            limit_egress = 200
        }
    },
    autoupdater = {
-        branch = 'beta',
+        branch = 'stable',
        branches = {
            stable = {
                name = 'stable',
@ -101,7 +100,8 @@
                    'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
                    '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
                    '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-                },
+                    'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
+                }
            },
            beta = {
                name = 'beta',
@ -112,7 +112,8 @@
                    'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
                    '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
                    '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-                },
+                    'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
+                }
            },
            experimental = {
                name = 'experimental',
@ -123,18 +124,21 @@
                    'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
                    '81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
                    '73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-                },
-            },
-        },
+                    'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
+                }
+            }
+        }
    },
    roles = {
        default = 'node',
        list = {
            'node',
+            'temp',
            'mobile',
            'offloader',
            'service',
            'test',
+            'hidden'
        },
    },
 }
--- a/site.mk
+++ b/site.mk
@ -75,10 +75,10 @@ USB_PACKAGES_STORAGE := \
 # ar71xx-generic
 GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
 GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
-GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
-GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
+GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
 GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
-GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
 GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
 GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
 GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
@ -102,14 +102,16 @@ GLUON_SITE_PACKAGES += \
    $(USB_PACKAGES_BASIC) \
    $(USB_PACKAGES_STORAGE)
 endif
-DEFAULT_GLUON_RELEASE := 0.8-beta1
+
+DEFAULT_GLUON_RELEASE := 0.9

 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

 GLUON_PRIORITY ?= 0

-GLUON_LANGS ?= en de
+GLUON_REGION ?= eu

-# Enable autoupdater
-GLUON_BRANCH := beta
+GLUON_ATH10K_MESH ?= ibss
+
+GLUON_LANGS ?= en de
Author	SHA1	Message	Date
Thomas Hooge	e35d11bae1	Merge branch 'experimental'	2017-07-23 11:09:57 +02:00
Thomas Hooge	1f3073a06a	Unterstütze Geräte mit ath10k Chipsatz durch Konfiguration von GLUON_ATH10K_MESH	2017-07-23 10:16:38 +02:00
Thomas Hooge	1abd153327	Tabs in Leerzeichen konvertiert	2017-07-23 09:26:00 +02:00
Thomas Hooge	62c0a512dc	Tabs in Leerzeichen konvertiert	2017-07-23 09:19:38 +02:00
Thomas Hooge	f497c62108	GLUON_REGION eingebaut für EU-Geräte	2017-03-03 21:25:38 +01:00
Thomas Hooge	e048e2314b	Neue Version basierend auf Gluon 2016.2.3; Unterstützung für u.a. EU-Version des 841ND v11. Rolle für versteckte Knoten eingebaut.	2017-03-03 21:02:58 +01:00
Thomas Hooge	66523e673d	Groß- Kleinschreibung angeglichen	2016-10-20 19:49:42 +02:00
Thomas Hooge	04d70e068d	Groß- Kleinschreibung angeglichen, 3G für 842er aktiviert	2016-10-20 19:23:10 +02:00
Thomas Hooge	c36ee7fc50	Einstellungen für die autom. Aktivierung des Autoupdaters korrigiert	2016-10-19 21:09:14 +02:00
Thomas Hooge	f4af7be190	Version 0.8 basierend auf Gluon 2016.1.6	2016-10-17 20:56:12 +02:00
Thomas Hooge	1f47243dea	Neue Rolle für temporäre Knoten, die z.B. nicht 24/7 verfügbar sind	2016-10-17 09:29:26 +02:00
thooge	d0089e3d31	Neuen Signierschlüssel integriert	2016-10-03 17:26:21 +02:00
root	1202bab645	UMTS/3G Pakete für einige Router aktiviert	2016-10-03 15:19:08 +02:00
thooge	5be5d1f155	Tippfehler korrigiert	2016-08-31 11:32:47 +02:00
Thomas Hooge	5c49cc9d8c	Experimental-Branch initialisiert	2016-08-31 11:31:22 +02:00