freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/freifunk-gluon/site-ffhl

Browse source 
Conflicts:
	site.conf
This commit is contained in:
ohrensessel 2014-09-11 22:57:51 +02:00
commit 43ac09cf11
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
site.conf
View file

@ -2,13 +2,13 @@
hostname_prefix = 'freifunk', hostname_prefix = 'freifunk',
site_name = 'Freifunk Hamburg', site_name = 'Freifunk Hamburg',
site_code = 'ffhh', site_code = 'ffhh',
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07-rc3/%S/packages',
prefix4 = '10.112.0.0/18', prefix4 = '10.112.0.0/18',
prefix6 = 'fd51:2bb2:fd0d::/64', prefix6 = 'fd51:2bb2:fd0d::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'}, ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
-- opkg_repo = 'http://opkg.services.ffki/attitude_adjustment/12.09/%S/packages', -- ffki ipv6 mirror
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {