Merge branch 'ipsec-includes' of https://github.com/godmodelabs/opnsense-core into godmodelabs-ipsec-includes

This commit is contained in:
Ad Schellevis 2019-03-12 10:49:04 +01:00
commit a116ab9f54

View File

@ -1003,6 +1003,7 @@ function ipsec_configure_do($verbose = false, $interface = '')
}
$strongswan = generate_strongswan_conf($strongswanTree);
$strongswan .= "\ninclude /usr/local/etc/strongswan.*.conf\n";
@file_put_contents("/usr/local/etc/strongswan.conf", $strongswan);
unset($strongswan);
@ -1096,6 +1097,7 @@ function ipsec_configure_do($verbose = false, $interface = '')
unset($key);
}
$pskconf .= "\ninclude /usr/local/etc/ipsec.*.secrets\n";
@file_put_contents("/usr/local/etc/ipsec.secrets", $pskconf);
chmod("/usr/local/etc/ipsec.secrets", 0600);
unset($pskconf);
@ -1550,6 +1552,7 @@ EOD;
}
}
}
$ipsecconf .= "\ninclude /usr/local/etc/ipsec.*.conf\n";
// dump file, replace tabs for 2 spaces
@file_put_contents("/usr/local/etc/ipsec.conf", str_replace("\t", ' ', $ipsecconf));
unset($ipsecconf);