Update modules

Update site.mk
Update modules
2016-07-30 10:35:45 +02:00 · 2016-07-26 20:01:31 +02:00 · 2016-07-26 19:59:19 +02:00 · 2016-07-14 19:12:08 +02:00 · 2016-07-14 19:04:10 +02:00 · 2016-07-14 17:57:23 +02:00
3 changed files with 29 additions and 22 deletions
--- a/12
+++ b/12
@ -1,8 +1,14 @@
-GLUON_SITE_FEEDS='tro ffrl'
+
+GLUON_SITE_FEEDS='tro ffrl airtime'

 PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
-PACKAGES_TRO_COMMIT=4149b51054551353b1bd58049f93015535c3424b
+PACKAGES_TRO_COMMIT=48d00e45a08686b4ca7358f83065cae5d8e5aaa2
 PACKAGES_TRO_BRANCH=v2016.1

 PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
-PACKAGES_FFRL_COMMIT=37618c0a3c33420f713080b3b66758b2fe533cbc
+PACKAGES_FFRL_BRANCH=Branch_v2016.1.x
+PACKAGES_FFRL_COMMIT=c6a6fd5ff2954495d8b6feae4094805d206917fc
+
+PACKAGES_AIRTIME_REPO=https://github.com/viisauksena/gluon-airtime.git
+PACKAGES_AIRTIME_COMMIT=640ff953364302f14a4a69ec02769b12068cc0b9
+PACKAGES_AIRTIME_BRANCH=master
--- a/site.conf
+++ b/site.conf
@ -1,10 +1,10 @@
 {
    hostname_prefix = 'tdf',
-    site_name = 'Freifunk Troisdorf',
-    site_code = 'tdf-',
+    site_name = 'Freifunk Troisdorf - Unterkünfte',
+    site_code = 'flu',
    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
-    prefix4 = '10.188.0.0/19',
-    prefix6 = '2a03:2260:121:0001::/64',
+    prefix4 = '10.188.64.0/19',
+    prefix6 = '2a03:2260:121:6000::/64',
    timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
    ntp_servers = {
        'ntp1.infra.fftdf',
@ -19,7 +19,7 @@
            ssid = 'Freifunk',
        },
        mesh = {        
-            id = 'troisdorf-tdf-mesh',      
+            id = 'troisdorf-flu-mesh',      
            mcast_rate = 12000,     
        },        
    },
@ -29,13 +29,13 @@
            ssid = 'Freifunk',
        },
        mesh = {        
-            id = 'troisdorf-tdf-mesh',      
+            id = 'troisdorf-flu-mesh',      
            mcast_rate = 12000,     
        },
    },
    next_node = {
-        ip4 = '10.188.0.1',
-        ip6 = '2a03:2260:121:0001::1',
+        ip4 = '10.188.64.1',
+        ip6 = '2a03:2260:121:6000::1',
        mac = '04:74:05:d0:4f:aa',
    },
    mesh = {
@ -50,9 +50,9 @@
            stable = {
                name = 'stable',
                mirrors = {
-                    'http://update1.infra.fftdf/tdf/stable/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/stable/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/stable/sysupgrade'
+                    'http://update1.infra.fftdf/flu/stable/sysupgrade',
+                    'http://update2.infra.fftdf/flu/stable/sysupgrade',
+                    'http://update3.infra.fftdf/flu/stable/sysupgrade'
                },
                probability = 1.00,
                good_signatures = 2,
@ -72,9 +72,9 @@
            beta = {
                name = 'beta',
                mirrors = {
-                    'http://update1.infra.fftdf/tdf/beta/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/beta/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/beta/sysupgrade'
+                    'http://update1.infra.fftdf/flu/beta/sysupgrade',
+                    'http://update2.infra.fftdf/flu/beta/sysupgrade',
+                    'http://update3.infra.fftdf/flu/beta/sysupgrade'
                },
                probability = 1.00,
                good_signatures = 1,
@ -93,9 +93,9 @@
            experimental = {
                name = 'experimental',
                mirrors = {
-                    'http://update1.infra.fftdf/tdf/experimental/sysupgrade',
-                    'http://update2.infra.fftdf/tdf/experimental/sysupgrade',
-                    'http://update3.infra.fftdf/tdf/experimental/sysupgrade'
+                    'http://update1.infra.fftdf/flu/experimental/sysupgrade',
+                    'http://update2.infra.fftdf/flu/experimental/sysupgrade',
+                    'http://update3.infra.fftdf/flu/experimental/sysupgrade'
                },
                probability = 1.00,
                good_signatures = 1,
@ -116,8 +116,8 @@
    tunneldigger_mesh_vpn = {
        mtu = 1312,
        brokers = {
-            'tdf1.freifunk-troisdorf.de:53842',
-            'tdf2.freifunk-troisdorf.de:53840'
+            'flu1.freifunk-troisdorf.de:53842',
+            'flu2.freifunk-troisdorf.de:53840'
            },
    },
    roles = {
--- a/site.mk
+++ b/site.mk
@ -20,6 +20,7 @@ GLUON_SITE_PACKAGES := \
    gluon-luci-node-role \
    gluon-next-node \
    gluon-mesh-vpn-tunneldigger \
+    gluon-tunneldigger-watchdog \
    gluon-radvd \
    gluon-status-page \
    iwinfo \
Author	SHA1	Message	Date
stebifan	f436dab572	Update modules	2016-07-30 10:35:45 +02:00
stebifan	2dd98221d0	Update site.mk	2016-07-26 20:01:31 +02:00
stebifan	eaaec1304c	Update modules	2016-07-26 19:59:19 +02:00
stebifan	12bbd78bdc	Update site.mk	2016-07-14 19:12:08 +02:00
stebifan	90484360f9	Update site.mk	2016-07-14 19:04:10 +02:00
stebifan	d9fbf9bb2e	Update site.mk	2016-07-14 17:57:23 +02:00
stebifan	0811d6a2e9	Update modules	2016-07-13 22:56:18 +02:00
stebifan	a0cb68473d	Update modules	2016-07-13 21:54:48 +02:00
stebifan	67a2afb087	Update modules	2016-07-13 20:39:51 +02:00
stebifan	9fd0f1ad33	Update modules	2016-07-13 00:52:31 +02:00
stebifan	fc6d974ee5	Update site.conf	2016-07-11 16:40:25 +02:00
Stefan Hoffmann	c0e61a1dd7	Merge branch 'v2016.1.x-flu' of https://github.com/Freifunk-Troisdorf/site into v2016.1.x-flu	2016-07-02 20:57:51 +02:00
Stefan Hoffmann	0bfc953dca	IPv6 Changes	2016-07-02 20:57:14 +02:00
stebifan	0c6bf6ba1c	Update modules	2016-06-25 11:13:28 +02:00
stebifan	bf8d0e1538	Update site.mk	2016-06-20 16:52:05 +02:00
Stefan Hoffmann	13c0e0e624	New Packages	2016-06-19 17:47:09 +02:00
Stefan Hoffmann	584692869d	New Site.conf	2016-05-20 22:06:01 +02:00