Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
978695e1
Commit
978695e1
authored
Feb 20, 2015
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove ipv6 fcgi-fpm leftovers
parent
a939026c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
15 deletions
+4
-15
interfaces.inc
src/etc/inc/interfaces.inc
+1
-3
rc.newwanipv6
src/etc/rc.newwanipv6
+3
-12
No files found.
src/etc/inc/interfaces.inc
View file @
978695e1
...
@@ -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
"
);
...
...
src/etc/rc.newwanipv6
View file @
978695e1
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment