freifunk/puppet-ff_gw
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

small cleanup

Browse source
This commit is contained in:
Martin Schuette 2014-06-22 18:29:59 +02:00
parent 30e37c0f37
commit 5b8b7454e3
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -14,8 +14,6 @@ design pattern.
## Open Problems ## Open Problems
* The current code overwrites `/etc/network/interfaces` -- this needs to be
improved.
* The apt repository at http://bird.network.cz/debian/ does not use PGP * The apt repository at http://bird.network.cz/debian/ does not use PGP
signatures, so `bird` and `bird6` will not be installed automatically. signatures, so `bird` and `bird6` will not be installed automatically.
* Setting the hostname should occur before everything else. So either * Setting the hostname should occur before everything else. So either

30
manifests/init.pp
View file

@ -1,11 +1,13 @@
class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv6, $secret_key, $vpn_ca_crt, $vpn_usr_crt, $vpn_usr_key, $dhcprange_start, $dhcprange_end, $gw_do_ic_peering = false, $tinc_name = false, $tinc_keyfile = '/etc/tinc/rsa_key.priv', $ic_vpn_ip4 = false, $ic_vpn_ip6 = false) { class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv4_netmask = '255.255.192.0', $gw_ipv6, $gw_ipv6_prefixlen = '64', $secret_key, $vpn_ca_crt, $vpn_usr_crt, $vpn_usr_key, $dhcprange_start, $dhcprange_end, $gw_do_ic_peering = false, $tinc_name = false, $tinc_keyfile = '/etc/tinc/rsa_key.priv', $ic_vpn_ip4 = false, $ic_vpn_ip6 = false) {
class { 'ff_gw::software': } class { 'ff_gw::software': }
-> ->
class { 'ff_gw::fastd': class { 'ff_gw::fastd':
mesh_mac => $mesh_mac, mesh_mac => $mesh_mac,
gw_ipv4 => $gw_ipv4, gw_ipv4 => $gw_ipv4,
gw_ipv6 => $gw_ipv6, gw_ipv4_netmask => $gw_ipv4_netmask,
secret_key => $secret_key, gw_ipv6 => $gw_ipv6,
gw_ipv6_prefixlen => $gw_ipv6_prefixlen,
secret_key => $secret_key,
} }
-> ->
class { 'ff_gw::dhcpd': class { 'ff_gw::dhcpd':
@ -29,7 +31,7 @@ class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv6, $secre
class { 'ff_gw::dnsmasq': } class { 'ff_gw::dnsmasq': }
-> ->
class { 'ff_gw::dns_resolvconf': class { 'ff_gw::dns_resolvconf':
gw_ipv4 => $gw_ipv4, gw_ipv4 => $gw_ipv4,
} }
-> ->
class { 'ff_gw::bird': class { 'ff_gw::bird':
@ -71,12 +73,12 @@ class ff_gw::software {
} }
} }
class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv6, $secret_key) { class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv4_netmask, $gw_ipv6, $gw_ipv6_prefixlen, $secret_key) {
validate_re($mesh_mac, '^de:ad:be:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}$') validate_re($mesh_mac, '^de:ad:be:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}$')
# TODO: parameterize interface names # TODO: parameterize interface names
$br_if='br-ffhh' $br_if = 'br-ffhh'
$bat_if='bat0' $bat_if = 'bat0'
$mesh_if='ffhh-mesh-vpn' $mesh_if = 'ffhh-mesh-vpn'
file { file {
'/etc/fastd/ffhh-mesh-vpn': '/etc/fastd/ffhh-mesh-vpn':
@ -113,8 +115,8 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv6, $secret_key) {
"set iface[. = '${br_if}'][1]/family inet6", "set iface[. = '${br_if}'][1]/family inet6",
"set iface[. = '${br_if}'][1]/method static", "set iface[. = '${br_if}'][1]/method static",
"set iface[. = '${br_if}'][1]/bridge-ports none", "set iface[. = '${br_if}'][1]/bridge-ports none",
"set iface[. = '${br_if}'][1]/address $gw_ipv6", "set iface[. = '${br_if}'][1]/address ${gw_ipv6}",
"set iface[. = '${br_if}'][1]/netmask 64", "set iface[. = '${br_if}'][1]/netmask ${gw_ipv6_prefixlen}",
], ],
} }
-> ->
@ -126,8 +128,8 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv6, $secret_key) {
"set iface[. = '${br_if}'][2] ${br_if}", "set iface[. = '${br_if}'][2] ${br_if}",
"set iface[. = '${br_if}'][2]/family inet", "set iface[. = '${br_if}'][2]/family inet",
"set iface[. = '${br_if}'][2]/method static", "set iface[. = '${br_if}'][2]/method static",
"set iface[. = '${br_if}'][2]/address $gw_ipv4", "set iface[. = '${br_if}'][2]/address ${gw_ipv4}",
"set iface[. = '${br_if}'][2]/netmask 255.255.192.0", "set iface[. = '${br_if}'][2]/netmask ${gw_ipv4_netmask}",
], ],
} }
-> ->