Skip to content
Snippets Groups Projects
Commit caaba488 authored by root's avatar root
Browse files

Gluon v2016.1.3

parent 1c9e2a55
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
site.conf
+ 71
− 13
View file @ caaba488
...@@ -16,10 +16,19 @@ ...@@ -16,10 +16,19 @@
'2a03:2267:4e6f:7264::fd01', '2a03:2267:4e6f:7264::fd01',
'2a03:2267:4e6f:7264::fd02', '2a03:2267:4e6f:7264::fd02',
'2a03:2267:4e6f:7264::fd03', '2a03:2267:4e6f:7264::fd03',
'2a03:2267:4e6f:7264::fd04', '2a03:2267:4e6f:7264::fd04',
'2a03:2267:4e6f:7264::fd05', '2a03:2267:4e6f:7264::fd05',
'2a03:2267:4e6f:7264::fd06', '2a03:2267:4e6f:7264::fd06',
}, '2a03:2267:4e6f:7264::fd07',
'2a03:2267:4e6f:7264::fd08',
'2a03:2267:4e6f:7264::fd09',
'2a03:2267:4e6f:7264::fd10',
'2a03:2267:4e6f:7264::fd11',
'2a03:2267:4e6f:7264::fd12',
'2a03:2267:4e6f:7264::fd13',
'2a03:2267:4e6f:7264::fd14',
'2a03:2267:4e6f:7264::fd15',
},
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
...@@ -86,7 +95,7 @@ ...@@ -86,7 +95,7 @@
}, },
ffnord_vpn4 = { ffnord_vpn4 = {
key = '2bd5bb1f45f76b0c43d3ba145b162d4d08960b12f968e5a7abeb2b3400b64d05', key = '2bd5bb1f45f76b0c43d3ba145b162d4d08960b12f968e5a7abeb2b3400b64d05',
remotes = {'ipv4 "vpn4.ffnord.net" port 10050','ipv6 "vpn4.ffnord.net" port 10050'}, remotes = {'ipv4 "vpn4.ffnord.net" port 10050', 'ipv6 "vpn4.ffnord.net" port 10050'},
}, },
ffnord_vpn5 = { ffnord_vpn5 = {
key = '766c2380bb1118ccd7132ad0588a65f20242c9d1995869c1509b0e91f1fc79e0', key = '766c2380bb1118ccd7132ad0588a65f20242c9d1995869c1509b0e91f1fc79e0',
...@@ -100,6 +109,38 @@ ...@@ -100,6 +109,38 @@
key = '6c35f366d430a6637cf5696fee2806b70ea4a3b3dfba2cb0e576b3ef4a77a7be', key = '6c35f366d430a6637cf5696fee2806b70ea4a3b3dfba2cb0e576b3ef4a77a7be',
remotes = {'ipv4 "vpn7.ffnord.net" port 10050', 'ipv6 "vpn7.ffnord.net" port 10050'}, remotes = {'ipv4 "vpn7.ffnord.net" port 10050', 'ipv6 "vpn7.ffnord.net" port 10050'},
}, },
ffnord_vpn8 = {
key = '9d6bf926071340171cc8a692c9a858e482a4368856dcb63e095e393049b8d6fd',
remotes = {'ipv4 "vpn8.ffnord.net" port 10050', 'ipv6 "vpn8.ffnord.net" port 10050'},
},
ffnord_vpn9 = {
key = '3b09482cee91e08839c1bfcca5a1135583c03817b1e8ff52019902faef7e2f28',
remotes = {'ipv4 "vpn9.ffnord.net" port 10050', 'ipv6 "vpn9.ffnord.net" port 10050'},
},
ffnord_vpn10 = {
key = 'a326197364109a3a7bfc9344e19da9277734989bc06d930617e00206feb6a065',
remotes = {'ipv4 "vpn10.ffnord.net" port 10050', 'ipv6 "vpn10.ffnord.net" port 10050'},
},
ffnord_vpn11 = {
key = '9ab17517450a52d1eac521a6ae4e696cf7861c3e55cd63acf0a94e85cb3e5172',
remotes = {'ipv4 "vpn11.ffnord.net" port 10050', 'ipv6 "vpn11.ffnord.net" port 10050'},
},
ffnord_vpn12 = {
key = 'bec4e95be17044ead0e1926b58cafc0d2cca9df3eb7a836234e886f3b51679f9',
remotes = {'ipv4 "vpn12.ffnord.net" port 10050', 'ipv6 "vpn12.ffnord.net" port 10050'},
},
ffnord_vpn13 = {
key = '1eeabc7534bed144c30b6d62f9cefd2e0b54607ac4c2ac1343c5153bceb01ab1',
remotes = {'ipv4 "vpn13.ffnord.net" port 10050', 'ipv6 "vpn13.ffnord.net" port 10050'},
},
ffnord_vpn14 = {
key = '5c7930f1fc37ceca6c921c13bed8010e4bada7e422aa69ad195c24f92c12f679',
remotes = {'ipv4 "vpn14.ffnord.net" port 10050', 'ipv6 "vpn14.ffnord.net" port 10050'},
},
ffnord_vpn15 = {
key = 'ae5bfc856ffc779bd766619aa24242890539495bdac03bf28405e41ba087b9a8',
remotes = {'ipv4 "vpn15.ffnord.net" port 10050', 'ipv6 "vpn15.ffnord.net" port 10050'},
},
}, },
}, },
}, },
...@@ -118,12 +159,21 @@ ...@@ -118,12 +159,21 @@
name = 'stable', name = 'stable',
mirrors = { mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd00]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd01]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd01]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd02]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd03]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd04]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd05]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/stable/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd06]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/stable/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/stable/sysupgrade/',
}, },
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
...@@ -136,16 +186,24 @@ ...@@ -136,16 +186,24 @@
'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77 'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77
}, },
}, },
experimental = { experimental = {
name = 'experimental', name = 'experimental',
mirrors = { mirrors = {
'http://[2a03:2267:4e6f:7264::fd00]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd00]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd01]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd02]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd02]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd03]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd03]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd04]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd04]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd05]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd05]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd06]/firmware/experimental/sysupgrade/', 'http://[2a03:2267:4e6f:7264::fd06]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd07]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd08]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd09]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd10]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd11]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd12]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd13]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd14]/firmware/experimental/sysupgrade/',
'http://[2a03:2267:4e6f:7264::fd15]/firmware/experimental/sysupgrade/',
}, },
probability = 0.1, probability = 0.1,
good_signatures = 1, good_signatures = 1,
......
site.mk
+ 3
− 2
View file @ caaba488
...@@ -20,6 +20,7 @@ GLUON_SITE_PACKAGES := \ ...@@ -20,6 +20,7 @@ GLUON_SITE_PACKAGES := \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-status-page \ gluon-status-page \
# gluon-au-change \
iwinfo \ iwinfo \
iptables \ iptables \
haveged haveged
...@@ -27,8 +28,8 @@ GLUON_SITE_PACKAGES := \ ...@@ -27,8 +28,8 @@ GLUON_SITE_PACKAGES := \
# Always call `make` from the command line with the desired release version! # Always call `make` from the command line with the desired release version!
# otherwise this is generated: # otherwise this is generated:
DEFAULT_GLUON_RELEASE := 0.16.2~exp$(shell date '+%y%m%d%H%M') DEFAULT_GLUON_RELEASE := 0.10~exp$(shell date '+%y%m%d%H%M')
#DEFAULT_GLUON_RELEASE := 0.16.2 #DEFAULT_GLUON_RELEASE := 0.16.3
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Hosted with love by Chaotikum e.V. Support us if you can