diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-16 05:27:13 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-16 05:27:13 +0000 |
| commit | bb0b58904a40cd007995fbfd9529398cd4b0417a (patch) | |
| tree | 44bff7402e3c61c6bb684c91b72de0955fc561d3 | |
| parent | c6ca47842d448e0d71e5dc7f52888de034fb65ce (diff) | |
| download | pfsense-packages-bb0b58904a40cd007995fbfd9529398cd4b0417a.tar.gz pfsense-packages-bb0b58904a40cd007995fbfd9529398cd4b0417a.tar.bz2 pfsense-packages-bb0b58904a40cd007995fbfd9529398cd4b0417a.zip | |
Make all area names consistent and fix a few c/p errors
| -rw-r--r-- | packages/carp_sync_client.php | 12 | ||||
| -rw-r--r-- | packages/carp_sync_server.php | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/carp_sync_client.php b/packages/carp_sync_client.php index b56c72e3..f7c9e90a 100644 --- a/packages/carp_sync_client.php +++ b/packages/carp_sync_client.php @@ -37,10 +37,10 @@ if($already_processed != 1) if($carp['synchronizerules'] <> "") { $current_rules_section = backup_config_section("filter"); /* generate firewall rules xml */ - $fout = fopen("{$g['tmp_path']}/rules_section.txt","w"); + $fout = fopen("{$g['tmp_path']}/filter_section.txt","w"); fwrite($fout, $current_rules_section); fclose($fout); - mwexec("/usr/bin/scp {$g['tmp_path']}/rules_section.txt root@{$synchronizetoip}:/tmp/"); + mwexec("/usr/bin/scp {$g['tmp_path']}/filter_section.txt root@{$synchronizetoip}:/tmp/"); unlink("{$g['tmp_path']}/rules_section.txt"); } if($carp['synchronizenat'] <> "") { @@ -64,15 +64,15 @@ if($already_processed != 1) if($carp['synchronizetrafficshaper'] <> "") { $current_trafficshaper_section = backup_config_section("shaper"); /* generate aliases xml */ - $fout = fopen("{$g['tmp_path']}/trafficshaper_section.txt","w"); + $fout = fopen("{$g['tmp_path']}/shaper_section.txt","w"); fwrite($fout, $current_trafficshaper_section); fclose($fout); - mwexec("/usr/bin/scp {$g['tmp_path']}/trafficshaper_section.txt root@{$synchronizetoip}:/tmp/"); - unlink("{$g['tmp_path']}/trafficshaper_section.txt"); + mwexec("/usr/bin/scp {$g['tmp_path']}/shaper_section.txt root@{$synchronizetoip}:/tmp/"); + unlink("{$g['tmp_path']}/shaper_section.txt"); } /* copy configuration to remote host */ mwexec("/usr/bin/ssh {$synchronizetoip} /usr/local/pkg/carp_sync_server.php"); } } } - + diff --git a/packages/carp_sync_server.php b/packages/carp_sync_server.php index 54142cdc..84c5fc82 100644 --- a/packages/carp_sync_server.php +++ b/packages/carp_sync_server.php @@ -42,7 +42,7 @@ if($config['installedpackages']['carpsettings']['config'] != "") $trafficshaper = return_filename_as_string("{$g['tmp_path']}/trafficshaper_section.txt"); if($rules <> "") { restore_config_section("filter", $rules); - unlink("{$g['tmp_path']}/rules_section.txt"); + unlink("{$g['tmp_path']}/filter_section.txt"); } if($aliases <> "") { restore_config_section("aliases", $aliases); @@ -54,7 +54,7 @@ if($config['installedpackages']['carpsettings']['config'] != "") } if($trafficshaper <> "") { restore_config_section("shaper", $trafficshaper); - unlink("{$g['tmp_path']}/nat_section.txt"); + unlink("{$g['tmp_path']}/shaper_section.txt"); } filter_configure(); |