finalize stable config

This commit is contained in:
ohrensessel 2014-04-04 23:07:49 +02:00
parent 048b6e0224
commit 378b7534b2

View file

@ -2,7 +2,7 @@
hostname_prefix => 'freifunk', hostname_prefix => 'freifunk',
site_name => 'Freifunk Hamburg', site_name => 'Freifunk Hamburg',
site_code => 'ffhh', site_code => 'ffhh',
release => '0.4+0-exp' . nightly, release => '0.4',
prefix4 => '10.112.0.0/18', prefix4 => '10.112.0.0/18',
prefix6 => 'fd51:2bb2:fd0d::/64', prefix6 => 'fd51:2bb2:fd0d::/64',
@ -131,27 +131,31 @@
branches => { branches => {
stable => { stable => {
name => 'stable', name => 'stable',
mirrors => ['http://1.updates.services.ffhh/stable/sysupgrade'], mirrors => ['http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'],
probability => 0.08, probability => 0.08,
good_signatures => 2, good_signatures => 2,
pubkeys => [ pubkeys => [
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
'', # leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
], ],
}, },
beta => { beta => {
name => 'beta', name => 'beta',
mirrors => ['http://1.updates.services.ffhh/beta/sysupgrade'], mirrors => ['http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'],
probability => 0.08, probability => 0.08,
good_signatures => 2, good_signatures => 2,
pubkeys => [ pubkeys => [
'', # baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
'', # leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
], ],
}, },
experimental => { experimental => {
name => 'experimental', name => 'experimental',
mirrors => ['http://1.updates.services.ffhh/experimental/sysupgrade'], mirrors => ['http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'],
probability => 1.00, probability => 1.00,
good_signatures => 1, good_signatures => 1,
pubkeys => [ pubkeys => [
@ -165,8 +169,8 @@
mesh_vpn => { mesh_vpn => {
ifname => 'mesh-vpn', ifname => 'mesh-vpn',
enabled => 0, enabled => 0,
limit_egress => 200, limit_egress => 300,
limit_ingress => 3000, limit_ingress => 4000,
}, },
}, },