Revision 17640b28
Added by Ermal LUÇI over 12 years ago
| etc/inc/upgrade_config.inc | ||
|---|---|---|
| 2695 | 2695 |
dump_rrd_to_xml("{$g['tmp_path']}/{$databasetmp}", "{$g['tmp_path']}/{$xmldumptmp}");
|
| 2696 | 2696 |
|
| 2697 | 2697 |
$rrdold = xml2array(file_get_contents("{$g['tmp_path']}/{$xmldump}"), 1, "tag");
|
| 2698 |
$rrdold = $rrdold['rrd']; |
|
| 2698 |
$rrdolder = $rrdold['rrd']; |
|
| 2699 |
unset($rrdold); |
|
| 2699 | 2700 |
|
| 2700 | 2701 |
$rrdnew = xml2array(file_get_contents("{$g['tmp_path']}/{$xmldumptmp}"), 1, "tag");
|
| 2701 |
$rrdnew = $rrdnew['rrd']; |
|
| 2702 |
$rrdnewer = $rrdnew['rrd']; |
|
| 2703 |
unset($rrdnew); |
|
| 2702 | 2704 |
|
| 2703 | 2705 |
/* remove any MAX RRA's. Not needed for traffic. */ |
| 2704 |
$i = 0; |
|
| 2705 |
foreach ($rrdold['rra'] as $rra) {
|
|
| 2706 |
if(trim($rra['cf']) == "MAX") {
|
|
| 2707 |
unset($rrdold['rra'][$i]); |
|
| 2706 |
if (is_array($rrdolder)) {
|
|
| 2707 |
$i = 0; |
|
| 2708 |
foreach ($rrdolder['rra'] as $rra) {
|
|
| 2709 |
if(trim($rra['cf']) == "MAX") {
|
|
| 2710 |
unset($rrdolder['rra'][$i]); |
|
| 2711 |
} |
|
| 2712 |
$i++; |
|
| 2708 | 2713 |
} |
| 2709 |
$i++; |
|
| 2710 |
} |
|
| 2711 |
|
|
| 2712 |
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw(migrate_rrd_format($rrdold, $rrdnew), "rrd"));
|
|
| 2713 |
mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1");
|
|
| 2714 | 2714 |
|
| 2715 |
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw(migrate_rrd_format($rrdolder, $rrdnewer), "rrd"));
|
|
| 2716 |
mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1");
|
|
| 2717 |
unset($rrdolder, $rrdnewer); |
|
| 2718 |
} |
|
| 2715 | 2719 |
} |
| 2716 | 2720 |
enable_rrd_graphing(); |
| 2717 | 2721 |
if ($g['booting']) |
| ... | ... | |
| 2720 | 2724 |
if (isset($rule['protocol']) && !empty($rule['protocol'])) |
| 2721 | 2725 |
$rule['protocol'] = strtolower($rule['protocol']); |
| 2722 | 2726 |
} |
| 2727 |
unset($rule); |
|
| 2723 | 2728 |
} |
| 2724 | 2729 |
|
| 2725 | 2730 |
function upgrade_081_to_082() {
|
| ... | ... | |
| 2735 | 2740 |
if (!empty($config['captiveportal'])) {
|
| 2736 | 2741 |
$tmpcp = $config['captiveportal']; |
| 2737 | 2742 |
$config['captiveportal'] = array(); |
| 2738 |
$config['captiveportal']['cpZone'] = array();
|
|
| 2739 |
$config['captiveportal']['cpZone'] = $tmpcp;
|
|
| 2740 |
$config['captiveportal']['cpZone']['zoneid'] = 8000;
|
|
| 2743 |
$config['captiveportal']['cpzone'] = array();
|
|
| 2744 |
$config['captiveportal']['cpzone'] = $tmpcp;
|
|
| 2745 |
$config['captiveportal']['cpzone']['zoneid'] = 8000;
|
|
| 2741 | 2746 |
} |
| 2742 | 2747 |
if (!empty($config['voucher'])) {
|
| 2743 | 2748 |
$tmpcp = $config['voucher']; |
| 2744 | 2749 |
$config['voucher'] = array(); |
| 2745 |
$config['voucher']['cpZone'] = array();
|
|
| 2746 |
$config['voucher']['cpZone'] = $tmpcp;
|
|
| 2750 |
$config['voucher']['cpzone'] = array();
|
|
| 2751 |
$config['voucher']['cpzone'] = $tmpcp;
|
|
| 2747 | 2752 |
} |
| 2748 | 2753 |
} |
| 2749 | 2754 |
|
| ... | ... | |
| 2805 | 2810 |
$rrddbpath = "/var/db/rrd"; |
| 2806 | 2811 |
foreach($oldnames as $old => $new) {
|
| 2807 | 2812 |
if(is_readable("{$rrddbpath}/{$old}-quality.rrd")) {
|
| 2808 |
rename("{$rrddbpath}/{$old}-quality.rrd", "{$rrddbpath}/{$new}-quality.rrd");
|
|
| 2813 |
@rename("{$rrddbpath}/{$old}-quality.rrd", "{$rrddbpath}/{$new}-quality.rrd");
|
|
| 2809 | 2814 |
} |
| 2810 | 2815 |
} |
| 2816 |
unset($gateways, $oldnames, $gateway_group_arr); |
|
| 2811 | 2817 |
} |
| 2812 | 2818 |
|
| 2813 | 2819 |
function upgrade_085_to_086() {
|
| ... | ... | |
| 2826 | 2832 |
write_config(); |
| 2827 | 2833 |
mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
|
| 2828 | 2834 |
require_once("config.lib.inc");
|
| 2835 |
unset($config); |
|
| 2829 | 2836 |
$config = parse_config(true); |
| 2830 | 2837 |
@unlink("{$g['tmp_path']}/vipreplace");
|
| 2831 | 2838 |
} |
| ... | ... | |
| 2867 | 2874 |
$dn_list[$link] = $qname; |
| 2868 | 2875 |
} |
| 2869 | 2876 |
} |
| 2877 |
unset($dummynet_pipe_list); |
|
| 2870 | 2878 |
} |
| 2871 | 2879 |
|
| 2872 | 2880 |
foreach ($config['filter']['rule'] as $idx => $rule) {
|
Also available in: Unified diff
Sprinkle some unset to reduce footprint