diff options
| author | jim-p <jimp@pfsense.org> | 2010-09-02 11:56:32 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-09-02 16:50:12 -0400 |
| commit | 79e1ffedf18806957fbb597911e63a957db05195 (patch) | |
| tree | 836be25ce2eef4eec9c4b3c715248cd305c8e634 /etc/rc.filter_synchronize | |
| parent | 0879599c4e11e5ba055a74cf4e3967320a25f49f (diff) | |
| download | pfsense-79e1ffedf18806957fbb597911e63a957db05195.zip pfsense-79e1ffedf18806957fbb597911e63a957db05195.tar.gz | |
Update sync code since CERT/CA have moved.
Diffstat (limited to 'etc/rc.filter_synchronize')
| -rwxr-xr-x | etc/rc.filter_synchronize | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 7731302..b8ab26a 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -165,8 +165,6 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens case 'virtualip': $xml[$section] = backup_vip_config_section(); break; - case 'cert': - case 'ca': case 'user': case 'group': $xml['system'][$section] = $config_copy['system'][$section]; @@ -270,8 +268,14 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { $sections[] = 'ipsec'; if ($carp['synchronizeopenvpn'] != "" and is_array($config['openvpn'])) { $sections[] = 'openvpn'; - $mergesections[] = 'cert'; - $mergesections[] = 'ca'; + $sections[] = 'cert'; + $sections[] = 'ca'; + } + if ($carp['synchronizecerts'] != "") { + if (is_array($config['cert'])) + $sections[] = 'cert'; + if (is_array($config['ca'])) + $sections[] = 'ca'; } if ($carp['synchronizeusers'] != "") { $mergesections[] = 'user'; |
