diff options
| author | doktornotor <notordoktor@gmail.com> | 2015-10-12 00:00:18 +0200 |
|---|---|---|
| committer | doktornotor <notordoktor@gmail.com> | 2015-10-12 00:00:18 +0200 |
| commit | f76829a211478295f6c94072742a32f8561ce263 (patch) | |
| tree | 6509a38fc1891095d8f177e7f3c499ce6a542f46 /config | |
| parent | d3554bcd81cc824f3f328e950082dd8da9d0a996 (diff) | |
| download | pfsense-packages-f76829a211478295f6c94072742a32f8561ce263.tar.gz pfsense-packages-f76829a211478295f6c94072742a32f8561ce263.tar.bz2 pfsense-packages-f76829a211478295f6c94072742a32f8561ce263.zip | |
Move reverse proxy config migration to squid_reverse.inc
Diffstat (limited to 'config')
| -rwxr-xr-x | config/squid3/34/squid.inc | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index cd502658..07d1da26 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -692,55 +692,8 @@ function squid_upgrade_config() { $config['installedpackages']['squidnac']['config'][0]['block_reply_mime_type'] = $settingsnac['block_reply_mime_type']; } - /* migrate reverse settings */ - if (is_array($config['installedpackages']['squidreverse'])) { - $old_reverse_settings = $config['installedpackages']['squidreverse']['config'][0]; - - // settings - if (!is_array($config['installedpackages']['squidreversegeneral'])) { - $config['installedpackages']['squidreversegeneral']['config'][0] = $old_reverse_settings; - unset($config['installedpackages']['squidreversegeneral']['config'][0]['reverse_cache_peer']); - unset($config['installedpackages']['squidreversegeneral']['config'][0]['reverse_uri']); - unset($config['installedpackages']['squidreversegeneral']['config'][0]['reverse_acl']); - } - - // peers - if (!is_array($config['installedpackages']['squidreversepeer'])) { - foreach (explode("\n", sq_text_area_decode($old_reverse_settings['reverse_cache_peer'])) as $cache_peers) { - foreach (explode(";", $cache_peers) as $cache_peer) { - $config['installedpackages']['squidreversepeer']['config'][] = array( - 'description' => 'migrated', - 'enable' => 'on', - 'name' => $cache_peer[0], - 'port' => $cache_peer[1], - 'protocol' => $cache_peer[2] - ); - } - } - } - - // mappings - if (!is_array($config['installedpackages']['squidreverseuri'])) { - foreach (explode("\n", sq_text_area_decode($old_reverse_settings['reverse_acl'])) as $acls) { - foreach (explode(";", $acls) as $acl) { - array_push(${'peer_'.$acl[0]}, $acl[1]); - } - } - foreach (explode("\n", sq_text_area_decode($old_reverse_settings['reverse_uri'])) as $uris) { - foreach (explode(";", $uris) as $uri) { - $peer_list = (is_array(${'peer_' . $uri[0]}) ? implode(",", ${'peer_' . $uri[0]}) : ""); - $config['installedpackages']['squidreverseuri']['config'][] = array( - 'description' => 'migrated', - 'enable' => 'on', - 'name' => $uri[0], - 'uri' => $uri[1], - 'vhost' => $uri[2], - 'peers' => $peer_list - ); - } - } - } - } + /* migrate reverse proxy settings */ + squid_reverse_upgrade_config(); /* unset broken antivirus settings */ squid_antivirus_upgrade_config(); |