Skip to content

Commit

Permalink
Merge pull request #93 from ffbsee/2.3.0
Browse files Browse the repository at this point in the history 
Merge 2.3.0 into master
  • Loading branch information
@mart-ffbsee
mart-ffbsee committed Sep 28, 2020
2 parents 217b7be + 7e32cf7 commit 3e19823
Show file tree
Hide file tree
Showing 25 changed files with 1,829 additions and 1,764 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Build commands for the console:
```bash
git clone git://git.openwrt.org/source.git
cd source
git reset --hard 8bf8de95a20d9fee54bbd579832c578c62cbc901
git reset --hard 5feb0df9bb3bd83ec49af17d2abc261fc58e2551

git clone https://github.com/ffbsee/ffbsee-firmware.git
cd ffbsee-firmware
Expand Down
8 changes: 4 additions & 4 deletions feeds.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src-git packages https://git.openwrt.org/feed/packages.git^42a98950b8ecd47706275ac3601ecc5525075580
src-git luci https://git.openwrt.org/project/luci.git^a4dc8f0d8da7da7a3eacce226c5f131431a2409a
src-git routing https://git.openwrt.org/feed/routing.git^66c20292c63a450a6f9926ccc6468d1b417f5306
src-git telephony https://git.openwrt.org/feed/telephony.git^956289cb103e3c44aab183770b765a4af25dd5a3
src-git packages https://git.openwrt.org/feed/packages.git^f5cb61cee5ef79903ee3c093fb31974c13e78ea5
src-git luci https://git.openwrt.org/project/luci.git;openwrt-19.07
src-git routing https://git.openwrt.org/feed/routing.git^9b42e24a54f03ebb6f58224b49036e8f739b175f
src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-19.07
261 changes: 257 additions & 4 deletions files/etc/config/fastd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ config peer_group 'backbone'
option net 'default'
option peer_limit '1'

config peer 'gw01'
config peer 'gw01_1250'
option enabled 1
option net 'default'
option group 'backbone'
Expand All @@ -29,7 +29,7 @@ config peer 'gw01'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1250'
option float 0

config peer 'gw02'
config peer 'gw02_1250'
option enabled 1
option net 'default'
option group 'backbone'
Expand All @@ -38,7 +38,7 @@ config peer 'gw02'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1250'
option float 0

config peer 'gw03'
config peer 'gw03_1250'
option enabled 1
option net 'default'
option group 'backbone'
Expand All @@ -47,11 +47,264 @@ config peer 'gw03'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1250'
option float 0

config peer 'gw04'
config peer 'gw04_1250'
option enabled 1
option net 'default'
option group 'backbone'
option key 'ab46cf23a48111d46451e32a60c18784ec47b903a5ae7c8df1c1ca38f73857fb'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1250'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1250'
option float 0

config peer 'gw01_1251'
option enabled 1
option net 'default'
option group 'backbone'
option key 'a5cd3a3c2a2f88a536c6876249652006645e3befdecba5948aae67ed20ad8027'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1251'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1251'
option float 0

config peer 'gw02_1251'
option enabled 1
option net 'default'
option group 'backbone'
option key '5f63cf7b0f385c53354c79df62249063e4bf00c1de4a4fcd50fd4ed18e2a0056'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1251'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1251'
option float 0

config peer 'gw03_1251'
option enabled 1
option net 'default'
option group 'backbone'
option key '8903b13f013f5e227c15df096642528621dc552ffbc79008531b9e687ac98183'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1251'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1251'
option float 0

config peer 'gw04_1251'
option enabled 1
option net 'default'
option group 'backbone'
option key '3ccdbc9917f5ada551b861fc7632e63a63ab45b97cfb6090da4157da91d159a5'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1251'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1251'
option float 0


config peer 'gw01_1252'
option enabled 1
option net 'default'
option group 'backbone'
option key '3fe5c26669f0c7efc6cb84bce89785979282a4eaafba04c6736e89f7b068fb6f'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1252'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1252'
option float 0

config peer 'gw02_1252'
option enabled 1
option net 'default'
option group 'backbone'
option key '13350c4def16882f76ba0d8ab9c7648d08a39008eb072c351cab5e546a57c228'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1252'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1252'
option float 0

config peer 'gw03_1252'
option enabled 1
option net 'default'
option group 'backbone'
option key '782177f5179ac359b7dd111fa23716d88e68da33147a5ebb5b4c03f50414f95a'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1252'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1252'
option float 0

config peer 'gw04_1252'
option enabled 1
option net 'default'
option group 'backbone'
option key '26e2fffda94c713cfa122139a270aee1be5e34b41646962547fb3f1f135b384d'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1252'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1252'
option float 0

config peer 'gw01_1253'
option enabled 1
option net 'default'
option group 'backbone'
option key '7ce66df91660b2a3d4460ee9cb4d9af7a7fba7f7cac761c5c18aad1de6acde06'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1253'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1253'
option float 0

config peer 'gw02_1253'
option enabled 1
option net 'default'
option group 'backbone'
option key '94b4bd8d519e1ecc56170bc5d98ebd9f39e39126088315897e83f2271893f476'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1253'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1253'
option float 0

config peer 'gw03_1253'
option enabled 1
option net 'default'
option group 'backbone'
option key 'd2c5628517397ed99a6d5d101066a801e23fe5436dea7c7a6335edf5ccb3c0c8'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1253'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1253'
option float 0

config peer 'gw04_1253'
option enabled 1
option net 'default'
option group 'backbone'
option key '64bb84e1d3da50d84b9dda8f7eda60de9c62dedb2857090b9cb73e4d6bab61fb'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1253'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1253'
option float 0

config peer 'gw01_1254'
option enabled 1
option net 'default'
option group 'backbone'
option key '6f4a3d8475bab1f025dc1dd01be69bb7f4b524dcb899669473a69db4f95d065f'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1254'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1254'
option float 0

config peer 'gw02_1254'
option enabled 1
option net 'default'
option group 'backbone'
option key 'aac357c59bb35f17a24e202bb6bc83b506e767919cc60c3e5179e4ea4e7efbe5'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1254'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1254'
option float 0

config peer 'gw03_1254'
option enabled 1
option net 'default'
option group 'backbone'
option key 'a6eed04b7540cf8d371bc00a6dd933c6b6da2ffffc4440d98fcd1bc2a588a64c'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1254'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1254'
option float 0

config peer 'gw04_1254'
option enabled 1
option net 'default'
option group 'backbone'
option key 'b59b0084fbfc41a769330bd553b3363708f8a88846151ef4a1ed7c89f49de2cf'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1254'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1254'
option float 0

config peer 'gw01_1255'
option enabled 1
option net 'default'
option group 'backbone'
option key '8dec2f6ef0ce19d304c2dfc86b5eeb24de8b34803204f150281a97c43e90dc62'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1255'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1255'
option float 0

config peer 'gw02_1255'
option enabled 1
option net 'default'
option group 'backbone'
option key '9fd3eff0bda9a0c63810ea0dcfe304872879f57b64f12b45f23b9d4723a10460'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1255'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1255'
option float 0

config peer 'gw03_1255'
option enabled 1
option net 'default'
option group 'backbone'
option key '690424fc827ec94327ad6647b1e0a5b80af597acefa974a3ee6a8ab7db3db978'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1255'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1255'
option float 0

config peer 'gw04_1255'
option enabled 1
option net 'default'
option group 'backbone'
option key 'e748dda2e6baf2394baedb93392d3a697579d400d038351cff392ecb3e503257'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1255'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1255'
option float 0

config peer 'gw01_1256'
option enabled 1
option net 'default'
option group 'backbone'
option key '7ba573c534ae265f13c0baac6ab93216df6d8b7dfda64259d5198e712c5a9498'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1256'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1256'
option float 0

config peer 'gw02_1256'
option enabled 1
option net 'default'
option group 'backbone'
option key '52d7780f906897390ec538863fca1c8dfa90a0aa8cf3b838da642f210205150e'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1256'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1256'
option float 0

config peer 'gw03_1256'
option enabled 1
option net 'default'
option group 'backbone'
option key 'a97ad93acd39dc453c36f7b3f46238dd9740e1d412aed7aac4608e094e2baf97'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1256'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1256'
option float 0

config peer 'gw04_1256'
option enabled 1
option net 'default'
option group 'backbone'
option key '7c9f57c96db9264b6967707b1b37db78c815b07ccc57b8d172bd9c931bc5159b'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1256'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1256'
option float 0

config peer 'gw01_1257'
option enabled 1
option net 'default'
option group 'backbone'
option key '2fe28d54badc76993e7acf71dbae04061c743af37b84c0e45890850988d95d19'
list remote 'ipv6 "speedtest5.gw01.ffbsee.net" port 1257'
list remote 'ipv4 "speedtest5.gw01.ffbsee.net" port 1257'
option float 0

config peer 'gw02_1257'
option enabled 1
option net 'default'
option group 'backbone'
option key '37d00c6d6dae021e179edba76f993ccc86eee7534d48d7e55551f3fdc695a3a8'
list remote 'ipv6 "speedtest5.gw02.ffbsee.net" port 1257'
list remote 'ipv4 "speedtest5.gw02.ffbsee.net" port 1257'
option float 0

config peer 'gw03_1257'
option enabled 1
option net 'default'
option group 'backbone'
option key 'bf4280e9ab6a00b0e21544a7a7aeaa5bcf1191ff4f47b62b545000189392fa35'
list remote 'ipv6 "speedtest5.gw03.ffbsee.net" port 1257'
list remote 'ipv4 "speedtest5.gw03.ffbsee.net" port 1257'
option float 0

config peer 'gw04_1257'
option enabled 1
option net 'default'
option group 'backbone'
option key 'eb654b772441e2739d28db44f84f9daa8439e3bb02172f7fe845f4c8ef8a6637'
list remote 'ipv6 "speedtest5.gw04.ffbsee.net" port 1257'
list remote 'ipv4 "speedtest5.gw04.ffbsee.net" port 1257'
option float 0
2 changes: 1 addition & 1 deletion files/etc/config/freifunk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ config settings
option longitude ''
option contact ''
option community 'bodensee'
option version '2.2.0'
option version '2.3.0'
option publish_map 'more'
option ipv6_only 'both'
option allow_access_from 'lan'
Expand Down
Loading

0 comments on commit 3e19823

Please sign in to comment.