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
0dad9094
Commit
0dad9094
authored
Aug 01, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
system: backup restore reboot as default, but only if selected #471
parent
14fabe46
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
16 deletions
+22
-16
diag_backup.php
src/www/diag_backup.php
+22
-16
No files found.
src/www/diag_backup.php
View file @
0dad9094
...
@@ -65,8 +65,8 @@ function restore_config_section($section_name, $new_contents)
...
@@ -65,8 +65,8 @@ function restore_config_section($section_name, $new_contents)
foreach
(
$xml
as
$xml_strip_root
)
{
foreach
(
$xml
as
$xml_strip_root
)
{
if
(
isset
(
$xml_strip_root
[
$section
]))
{
if
(
isset
(
$xml_strip_root
[
$section
]))
{
$section_xml
=
$xml_strip_root
[
$section
];
$section_xml
=
$xml_strip_root
[
$section
];
break
;
break
;
}
}
}
}
if
(
$section_xml
=
-
1
&&
isset
(
$xml
[
$section_name
]))
{
if
(
$section_xml
=
-
1
&&
isset
(
$xml
[
$section_name
]))
{
...
@@ -201,6 +201,8 @@ $areas = array(
...
@@ -201,6 +201,8 @@ $areas = array(
'wol'
=>
gettext
(
'Wake on LAN'
),
'wol'
=>
gettext
(
'Wake on LAN'
),
);
);
$do_reboot
=
false
;
if
(
$_SERVER
[
'REQUEST_METHOD'
]
===
'GET'
)
{
if
(
$_SERVER
[
'REQUEST_METHOD'
]
===
'GET'
)
{
$pconfig
=
array
();
$pconfig
=
array
();
$pconfig
[
'GDriveEnabled'
]
=
isset
(
$config
[
'system'
][
'remotebackup'
][
'GDriveEnabled'
])
?
$config
[
'system'
][
'remotebackup'
][
'GDriveEnabled'
]
:
null
;
$pconfig
[
'GDriveEnabled'
]
=
isset
(
$config
[
'system'
][
'remotebackup'
][
'GDriveEnabled'
])
?
$config
[
'system'
][
'remotebackup'
][
'GDriveEnabled'
]
:
null
;
...
@@ -310,8 +312,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
...
@@ -310,8 +312,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config
();
write_config
();
convert_config
();
convert_config
();
}
}
filter_configure
();
if
(
!
empty
(
pconfig
[
'rebootafterrestore'
]))
{
$savemsg
=
gettext
(
"The configuration area has been restored. You should reboot the firewall."
);
$do_reboot
=
true
;
}
$savemsg
=
gettext
(
"The configuration area has been restored."
);
}
}
}
else
{
}
else
{
/* restore the entire configuration */
/* restore the entire configuration */
...
@@ -319,8 +323,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
...
@@ -319,8 +323,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
file_put_contents
(
$filename
,
$data
);
file_put_contents
(
$filename
,
$data
);
$cnf
=
OPNsense\Core\Config
::
getInstance
();
$cnf
=
OPNsense\Core\Config
::
getInstance
();
if
(
$cnf
->
restoreBackup
(
$filename
))
{
if
(
$cnf
->
restoreBackup
(
$filename
))
{
/* this will be picked up by /index.php */
if
(
!
empty
(
pconfig
[
'rebootafterrestore'
]))
{
mark_subsystem_dirty
(
"restore"
);
$do_reboot
=
true
;
}
$config
=
parse_config
();
$config
=
parse_config
();
/* extract out rrd items, unset from $config when done */
/* extract out rrd items, unset from $config when done */
if
(
$config
[
'rrddata'
])
{
if
(
$config
[
'rrddata'
])
{
...
@@ -423,11 +428,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
...
@@ -423,11 +428,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config
();
write_config
();
convert_config
();
convert_config
();
$savemsg
=
gettext
(
"The m0n0wall configuration has been restored and upgraded to OPNsense."
);
$savemsg
=
gettext
(
"The m0n0wall configuration has been restored and upgraded to OPNsense."
);
}
else
{
$savemsg
=
gettext
(
"The configuration has been restored."
);
}
}
}
else
{
}
else
{
$input_errors
[]
=
gettext
(
"The configuration could not be restored."
);
$input_errors
[]
=
gettext
(
"The configuration could not be restored."
);
}
}
}
}
if
(
$do_reboot
)
{
$savemsg
.=
' '
.
gettext
(
"The system is rebooting now. This may take one minute."
);
}
}
}
}
elseif
(
$mode
==
"setup_gdrive"
){
}
elseif
(
$mode
==
"setup_gdrive"
){
if
(
!
isset
(
$config
[
'system'
][
'remotebackup'
]))
{
if
(
!
isset
(
$config
[
'system'
][
'remotebackup'
]))
{
...
@@ -518,12 +529,6 @@ $( document ).ready(function() {
...
@@ -518,12 +529,6 @@ $( document ).ready(function() {
<div
class=
"container-fluid"
>
<div
class=
"container-fluid"
>
<div
class=
"row"
>
<div
class=
"row"
>
<?php
if
(
isset
(
$savemsg
))
print_info_box
(
$savemsg
);
?>
<?php
if
(
isset
(
$savemsg
))
print_info_box
(
$savemsg
);
?>
<?php
if
(
is_subsystem_dirty
(
'restore'
))
:
?>
<br/>
<form
action=
"reboot.php"
method=
"post"
>
<input
name=
"Submit"
type=
"hidden"
value=
"Yes"
/>
<?php
print_info_box
(
gettext
(
"The firewall configuration has been changed."
)
.
"<br />"
.
gettext
(
"The firewall is now rebooting."
));
?>
<br
/>
</form>
<?php
endif
;
?>
<?php
if
(
$input_messages
)
print_info_box
(
$input_messages
);
?>
<?php
if
(
$input_messages
)
print_info_box
(
$input_messages
);
?>
<?php
if
(
isset
(
$input_errors
)
&&
count
(
$input_errors
)
>
0
)
print_input_errors
(
$input_errors
);
?>
<?php
if
(
isset
(
$input_errors
)
&&
count
(
$input_errors
)
>
0
)
print_input_errors
(
$input_errors
);
?>
<form
method=
"post"
enctype=
"multipart/form-data"
>
<form
method=
"post"
enctype=
"multipart/form-data"
>
...
@@ -589,6 +594,8 @@ $( document ).ready(function() {
...
@@ -589,6 +594,8 @@ $( document ).ready(function() {
endforeach
;
?>
endforeach
;
?>
</select><br/>
</select><br/>
<input
name=
"conffile"
type=
"file"
id=
"conffile"
/><br/>
<input
name=
"conffile"
type=
"file"
id=
"conffile"
/><br/>
<input
name=
"rebootafterrestore"
type=
"checkbox"
id=
"rebootafterrestore"
checked=
"checked"
/>
<?=
gettext
(
"Reboot after a successful restore."
);
?>
<br/>
<input
name=
"decrypt"
type=
"checkbox"
id=
"decryptconf"
/>
<input
name=
"decrypt"
type=
"checkbox"
id=
"decryptconf"
/>
<?=
gettext
(
"Configuration file is encrypted."
);
?>
<?=
gettext
(
"Configuration file is encrypted."
);
?>
<div
class=
"hidden table-responsive __mt"
id=
"decrypt_opts"
>
<div
class=
"hidden table-responsive __mt"
id=
"decrypt_opts"
>
...
@@ -613,7 +620,6 @@ $( document ).ready(function() {
...
@@ -613,7 +620,6 @@ $( document ).ready(function() {
<tr>
<tr>
<td>
<td>
<?=
gettext
(
"Open a configuration XML file and click the button below to restore the configuration."
);
?>
<br/>
<?=
gettext
(
"Open a configuration XML file and click the button below to restore the configuration."
);
?>
<br/>
<span
class=
"text-danger"
>
<?=
gettext
(
"The firewall will reboot after restoring the configuration."
);
?>
</span>
</td>
</td>
</tr>
</tr>
</tbody>
</tbody>
...
@@ -693,10 +699,10 @@ $( document ).ready(function() {
...
@@ -693,10 +699,10 @@ $( document ).ready(function() {
</div>
</div>
</section>
</section>
<?php
include
(
"foot.inc"
);
?>
<?php
<?php
if
(
is_subsystem_dirty
(
'restore'
))
{
include
(
"foot.inc"
);
if
(
$do_reboot
)
{
system_reboot
();
system_reboot
();
}
}
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