Commit 978695e1 authored by Ad Schellevis's avatar Ad Schellevis

remove ipv6 fcgi-fpm leftovers

parent a939026c
...@@ -3606,9 +3606,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { ...@@ -3606,9 +3606,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
$dhcp6cscript = "#!/bin/sh\n"; $dhcp6cscript = "#!/bin/sh\n";
$dhcp6cscript .= "# This shell script launches /usr/local/etc/rc.newwanipv6 with a interface argument.\n"; $dhcp6cscript .= "# This shell script launches /usr/local/etc/rc.newwanipv6 with a interface argument.\n";
$dhcp6cscript .= "dmips=\${new_domain_name_servers}\n"; $dhcp6cscript .= "/etc/rc.newwanipv6 {$wanif} \n";
$dhcp6cscript .= "dmnames=\${new_domain_name}\n";
$dhcp6cscript .= "/usr/local/sbin/fcgicli -f /usr/local/etc/rc.newwanipv6 -d \"interface={$wanif}&dmnames=\${dmnames}&dmips=\${dmips}\"\n";
/* Add wide-dhcp6c shell script here. Because we can not pass a argument to it. */ /* Add wide-dhcp6c shell script here. Because we can not pass a argument to it. */
if (!@file_put_contents("{$g['varetc_path']}/dhcp6c_{$interface}_script.sh", $dhcp6cscript)) { if (!@file_put_contents("{$g['varetc_path']}/dhcp6c_{$interface}_script.sh", $dhcp6cscript)) {
printf("Error: cannot open dhcp6c_{$interface}_script.sh in interface_dhcpv6_configure() for writing.\n"); printf("Error: cannot open dhcp6c_{$interface}_script.sh in interface_dhcpv6_configure() for writing.\n");
......
...@@ -55,10 +55,7 @@ function restart_packages() { ...@@ -55,10 +55,7 @@ function restart_packages() {
} }
/* Interface IP address has changed */ /* Interface IP address has changed */
if (isset($_GET)) $argument = trim($argv[1], " \n\t");
$argument = $_GET['interface'];
else
$argument = trim($argv[1], " \n\t");
log_error("rc.newwanipv6: Informational is starting {$argument}."); log_error("rc.newwanipv6: Informational is starting {$argument}.");
...@@ -94,10 +91,7 @@ if ((empty($curwanipv6) || !is_ipaddrv6($curwanipv6)) && substr($interface_real, ...@@ -94,10 +91,7 @@ if ((empty($curwanipv6) || !is_ipaddrv6($curwanipv6)) && substr($interface_real,
return; return;
} }
if (isset($_GET)) $new_domain_name_servers = getenv("new_domain_name_servers");
$new_domain_name_servers = $_GET['dmips'];
else
$new_domain_name_servers = getenv("new_domain_name_servers");
if (!empty($new_domain_name_servers)) { if (!empty($new_domain_name_servers)) {
$name_servers = explode(" ", $new_domain_name_servers); $name_servers = explode(" ", $new_domain_name_servers);
$valid_ns = array(); $valid_ns = array();
...@@ -109,10 +103,7 @@ if (!empty($new_domain_name_servers)) { ...@@ -109,10 +103,7 @@ if (!empty($new_domain_name_servers)) {
if (count($valid_ns > 0)) if (count($valid_ns > 0))
file_put_contents("{$g['varetc_path']}/nameserver_v6{$interface}", implode("\n", $valid_ns)); file_put_contents("{$g['varetc_path']}/nameserver_v6{$interface}", implode("\n", $valid_ns));
} }
if (isset($_GET)) $new_domain_name = getenv("new_domain_name");
$new_domain_name = $_GET['dmnames'];
else
$new_domain_name = getenv("new_domain_name");
if (!empty($new_domain_name)) if (!empty($new_domain_name))
file_put_contents("{$g['varetc_path']}/searchdomain_v6{$interface}", $new_domain_name); file_put_contents("{$g['varetc_path']}/searchdomain_v6{$interface}", $new_domain_name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment