krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source 
Conflicts:
	site.conf
This commit is contained in:
Franz Pletz
2014-12-01 22:05:08 +01:00
parent 88d3cde9f0 1be0e3bc73
commit 7361f4fc15
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
site.conf
View File

@@ -1,13 +1,14 @@
{
hostname_prefix = 'freifunk',
hostname_prefix = '',
site_name = 'Freifunk München',
site_code = 'ffm',
site_code = 'ffmuc',
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
prefix4 = '10.80.0.0/16',
prefix6 = 'fdef:ffc0:4fff::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffm'},
ntp_servers = {'1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'},
regdom = 'DE',
@@ -15,7 +16,7 @@
ssid = 'muenchen.freifunk.net',
channel = 1,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffm',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_mcast_rate = 12000,
},
@@ -24,7 +25,7 @@
ssid = 'muenchen.freifunk.net',
channel = 44,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffm',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_mcast_rate = 12000,
},