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

fix whitespace

Browse source
This commit is contained in:
Martin Schuette 2014-06-22 22:34:56 +02:00
parent daf7f768f0
commit 9e93f9a9e5
1 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
manifests/init.pp
View file

@ -1,21 +1,21 @@
class ff_gw( class ff_gw(
$ff_net, $ff_net,
$ff_mesh_net, $ff_mesh_net,
$ff_as, $ff_as,
$mesh_mac, $mesh_mac,
$gw_ipv4, $gw_ipv4_netmask = '255.255.192.0', $gw_ipv4, $gw_ipv4_netmask = '255.255.192.0',
$gw_ipv6, $gw_ipv6_prefixlen = '64', $gw_ipv6, $gw_ipv6_prefixlen = '64',
$secret_key, # for fastd $secret_key, # for fastd
$vpn_provider = 'mullvad', # supported: mullvad or hideme $vpn_provider = 'mullvad', # supported: mullvad or hideme
$vpn_ca_crt, $vpn_usr_crt, $vpn_usr_key, # openvpn x.509 credentials $vpn_ca_crt, $vpn_usr_crt, $vpn_usr_key, # openvpn x.509 credentials
$vpn_usr_name = false, # openvpn user for auth-user-pass $vpn_usr_name = false, # openvpn user for auth-user-pass
$vpn_usr_pass = false, # openvpn password for auth-user-pass $vpn_usr_pass = false, # openvpn password for auth-user-pass
$dhcprange_start, $dhcprange_end, $dhcprange_start, $dhcprange_end,
$gw_do_ic_peering = false, # configure inter city VPN $gw_do_ic_peering = false, # configure inter city VPN
$tinc_name = false, $tinc_name = false,
$tinc_keyfile = '/etc/tinc/rsa_key.priv', $tinc_keyfile = '/etc/tinc/rsa_key.priv',
$ic_vpn_ip4 = false, $ic_vpn_ip4 = false,
$ic_vpn_ip6 = false $ic_vpn_ip6 = false
) { ) {
class { 'ff_gw::software': } class { 'ff_gw::software': }
-> ->
@ -128,9 +128,8 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv4_netmask, $gw_ipv6, $gw_ipv6_pre
# but I found none that is flexible enough to handle all our config lines # but I found none that is flexible enough to handle all our config lines
augeas { augeas {
"${br_if}-inet6": "${br_if}-inet6":
context => '/files/etc/network/interfaces', context => '/files/etc/network/interfaces',
show_diff => true, changes => [
changes => [
"set auto[child::1 = '${br_if}']/1 ${br_if}", "set auto[child::1 = '${br_if}']/1 ${br_if}",
"set iface[. = '${br_if}'][1] ${br_if}", "set iface[. = '${br_if}'][1] ${br_if}",
"set iface[. = '${br_if}'][1]/family inet6", "set iface[. = '${br_if}'][1]/family inet6",
@ -143,9 +142,8 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv4_netmask, $gw_ipv6, $gw_ipv6_pre
-> ->
augeas { augeas {
"${br_if}-inet": "${br_if}-inet":
context => '/files/etc/network/interfaces', context => '/files/etc/network/interfaces',
show_diff => true, changes => [
changes => [
"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",
@ -156,10 +154,9 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv4_netmask, $gw_ipv6, $gw_ipv6_pre
-> ->
# TODO: parameterize ffhh-mesh-vpn # TODO: parameterize ffhh-mesh-vpn
augeas { augeas {
"${bat_if}": $bat_if:
context => '/files/etc/network/interfaces', context => '/files/etc/network/interfaces',
show_diff => true, changes => [
changes => [
"set allow-hotplug[child::1 = '${bat_if}']/1 ${bat_if}", "set allow-hotplug[child::1 = '${bat_if}']/1 ${bat_if}",
"set iface[. = '${bat_if}'] ${bat_if}", "set iface[. = '${bat_if}'] ${bat_if}",
"set iface[. = '${bat_if}']/family inet6", "set iface[. = '${bat_if}']/family inet6",
@ -413,7 +410,7 @@ class ff_gw::vpn($provider, $ca_crt, $usr_crt, $usr_key, $usr_name, $usr_pass, $
# TODO: maybe we should check that provider and auth methods match # TODO: maybe we should check that provider and auth methods match
# atm we trust the caller to give the right combination # atm we trust the caller to give the right combination
if str2bool("$usr_name") { if str2bool($usr_name) {
# hideme config with user/pass file # hideme config with user/pass file
file { file {
"/etc/openvpn/${provider}/auth.txt": "/etc/openvpn/${provider}/auth.txt":
@ -456,10 +453,10 @@ exit 0';
"/etc/openvpn/${provider}.conf": "/etc/openvpn/${provider}.conf":
ensure => file, ensure => file,
source => "puppet:///modules/ff_gw/etc/openvpn/${provider}.conf"; source => "puppet:///modules/ff_gw/etc/openvpn/${provider}.conf";
"/etc/openvpn/update-dnsmasq-forward": '/etc/openvpn/update-dnsmasq-forward':
ensure => file, ensure => file,
mode => '0755', mode => '0755',
source => "puppet:///modules/ff_gw/etc/openvpn/update-dnsmasq-forward"; source => 'puppet:///modules/ff_gw/etc/openvpn/update-dnsmasq-forward';
} }
~> ~>
service { 'openvpn': service { 'openvpn':