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

11
manifests/init.pp
View file

@ -129,7 +129,6 @@ class ff_gw::fastd($mesh_mac, $gw_ipv4, $gw_ipv4_netmask, $gw_ipv6, $gw_ipv6_pre
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}",
@ -144,7 +143,6 @@ 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",
@ -156,9 +154,8 @@ 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}",
@ -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':