Revision 9ad72e5e
Added by Jim Pingle almost 15 years ago
| etc/inc/upgrade_config.inc | ||
|---|---|---|
| 1311 | 1311 |
function upgrade_051_to_052() {
|
| 1312 | 1312 |
global $config; |
| 1313 | 1313 |
$config['openvpn'] = array(); |
| 1314 |
if (!is_array($config['system']['ca']))
|
|
| 1315 |
$config['system']['ca'] = array();
|
|
| 1316 |
if (!is_array($config['system']['cert']))
|
|
| 1317 |
$config['system']['cert'] = array();
|
|
| 1314 |
if (!is_array($config['ca'])) |
|
| 1315 |
$config['ca'] = array(); |
|
| 1316 |
if (!is_array($config['cert'])) |
|
| 1317 |
$config['cert'] = array(); |
|
| 1318 | 1318 |
|
| 1319 | 1319 |
$vpnid = 1; |
| 1320 | 1320 |
|
| ... | ... | |
| 1336 | 1336 |
$ca['name'] = "OpenVPN Server CA #{$index}";
|
| 1337 | 1337 |
$ca['crt'] = $server['ca_cert']; |
| 1338 | 1338 |
$ca['crl'] = $server['crl']; |
| 1339 |
$config['system']['ca'][] = $ca;
|
|
| 1339 |
$config['ca'][] = $ca; |
|
| 1340 | 1340 |
|
| 1341 | 1341 |
/* create ca reference */ |
| 1342 | 1342 |
unset($server['ca_cert']); |
| ... | ... | |
| 1349 | 1349 |
$cert['name'] = "OpenVPN Server Certificate #{$index}";
|
| 1350 | 1350 |
$cert['crt'] = $server['server_cert']; |
| 1351 | 1351 |
$cert['prv'] = $server['server_key']; |
| 1352 |
$config['system']['cert'][] = $cert;
|
|
| 1352 |
$config['cert'][] = $cert; |
|
| 1353 | 1353 |
|
| 1354 | 1354 |
/* create cert reference */ |
| 1355 | 1355 |
unset($server['server_cert']); |
| ... | ... | |
| 1466 | 1466 |
$ca['name'] = "OpenVPN Client CA #{$index}";
|
| 1467 | 1467 |
$ca['crt'] = $client['ca_cert']; |
| 1468 | 1468 |
$ca['crl'] = $client['crl']; |
| 1469 |
$config['system']['ca'][] = $ca;
|
|
| 1469 |
$config['ca'][] = $ca; |
|
| 1470 | 1470 |
|
| 1471 | 1471 |
/* create ca reference */ |
| 1472 | 1472 |
unset($client['ca_cert']); |
| ... | ... | |
| 1479 | 1479 |
$cert['name'] = "OpenVPN Client Certificate #{$index}";
|
| 1480 | 1480 |
$cert['crt'] = $client['client_cert']; |
| 1481 | 1481 |
$cert['prv'] = $client['client_key']; |
| 1482 |
$config['system']['cert'][] = $cert;
|
|
| 1482 |
$config['cert'][] = $cert; |
|
| 1483 | 1483 |
|
| 1484 | 1484 |
/* create cert reference */ |
| 1485 | 1485 |
unset($client['client_cert']); |
| ... | ... | |
| 1629 | 1629 |
|
| 1630 | 1630 |
function upgrade_052_to_053() {
|
| 1631 | 1631 |
global $config; |
| 1632 |
if (!is_array($config['system']['ca']))
|
|
| 1633 |
$config['system']['ca'] = array();
|
|
| 1634 |
if (!is_array($config['system']['cert']))
|
|
| 1635 |
$config['system']['cert'] = array();
|
|
| 1632 |
if (!is_array($config['ca'])) |
|
| 1633 |
$config['ca'] = array(); |
|
| 1634 |
if (!is_array($config['cert'])) |
|
| 1635 |
$config['cert'] = array(); |
|
| 1636 | 1636 |
|
| 1637 | 1637 |
/* migrate advanced admin page webui ssl to certifcate mngr */ |
| 1638 | 1638 |
if ($config['system']['webgui']['certificate'] && |
| ... | ... | |
| 1644 | 1644 |
$cert['name'] = "webConfigurator SSL Certificate"; |
| 1645 | 1645 |
$cert['crt'] = $config['system']['webgui']['certificate']; |
| 1646 | 1646 |
$cert['prv'] = $config['system']['webgui']['private-key']; |
| 1647 |
$config['system']['cert'][] = $cert;
|
|
| 1647 |
$config['cert'][] = $cert; |
|
| 1648 | 1648 |
|
| 1649 | 1649 |
/* create cert reference */ |
| 1650 | 1650 |
unset($config['system']['webgui']['certificate']); |
| ... | ... | |
| 1853 | 1853 |
function upgrade_055_to_056() {
|
| 1854 | 1854 |
global $config; |
| 1855 | 1855 |
|
| 1856 |
if (!is_array($config['system']['ca']))
|
|
| 1857 |
$config['system']['ca'] = array();
|
|
| 1858 |
if (!is_array($config['system']['cert']))
|
|
| 1859 |
$config['system']['cert'] = array();
|
|
| 1856 |
if (!is_array($config['ca'])) |
|
| 1857 |
$config['ca'] = array(); |
|
| 1858 |
if (!is_array($config['cert'])) |
|
| 1859 |
$config['cert'] = array(); |
|
| 1860 | 1860 |
|
| 1861 | 1861 |
/* migrate ipsec ca's to cert manager */ |
| 1862 | 1862 |
if (is_array($config['ipsec']['cacert'])) {
|
| ... | ... | |
| 1868 | 1868 |
else |
| 1869 | 1869 |
$ca['crt'] = $cacert['cert']; |
| 1870 | 1870 |
$ca['name'] = $cacert['ident']; |
| 1871 |
$config['system']['ca'][] = $ca;
|
|
| 1871 |
$config['ca'][] = $ca; |
|
| 1872 | 1872 |
} |
| 1873 | 1873 |
unset($config['ipsec']['cacert']); |
| 1874 | 1874 |
} |
| ... | ... | |
| 1884 | 1884 |
else |
| 1885 | 1885 |
$cert['crt'] = $ph1ent['cert']; |
| 1886 | 1886 |
$cert['prv'] = $ph1ent['private-key']; |
| 1887 |
$config['system']['cert'][] = $cert;
|
|
| 1887 |
$config['cert'][] = $cert; |
|
| 1888 | 1888 |
$ph1ent['certref'] = $cert['refid']; |
| 1889 | 1889 |
if ($ph1ent['cert']) |
| 1890 | 1890 |
unset($ph1ent['cert']); |
| ... | ... | |
| 1940 | 1940 |
function upgrade_059_to_060() {
|
| 1941 | 1941 |
global $config; |
| 1942 | 1942 |
require_once("/etc/inc/certs.inc");
|
| 1943 |
if (is_array($config['system']['ca'])) {
|
|
| 1943 |
if (is_array($config['ca'])) {
|
|
| 1944 | 1944 |
/* Locate issuer for all CAs */ |
| 1945 |
foreach ($config['system']['ca'] as & $ca) {
|
|
| 1945 |
foreach ($config['ca'] as & $ca) {
|
|
| 1946 | 1946 |
$subject = cert_get_subject($ca['crt']); |
| 1947 | 1947 |
$issuer = cert_get_issuer($ca['crt']); |
| 1948 | 1948 |
if($issuer <> $subject) {
|
| ... | ... | |
| 1953 | 1953 |
} |
| 1954 | 1954 |
|
| 1955 | 1955 |
/* Locate issuer for all certificates */ |
| 1956 |
if (is_array($config['system']['cert'])) {
|
|
| 1957 |
foreach ($config['system']['cert'] as & $cert) {
|
|
| 1956 |
if (is_array($config['cert'])) {
|
|
| 1957 |
foreach ($config['cert'] as & $cert) {
|
|
| 1958 | 1958 |
$subject = cert_get_subject($cert['crt']); |
| 1959 | 1959 |
$issuer = cert_get_issuer($cert['crt']); |
| 1960 | 1960 |
if($issuer <> $subject) {
|
| ... | ... | |
| 2146 | 2146 |
} |
| 2147 | 2147 |
} |
| 2148 | 2148 |
|
| 2149 |
function upgrade_066_to_067() {
|
|
| 2150 |
global $config; |
|
| 2151 |
if (isset($config['system']['ca'])) {
|
|
| 2152 |
$config['ca'] = $config['system']['ca']; |
|
| 2153 |
} |
|
| 2154 |
if (isset($config['system']['cert'])) {
|
|
| 2155 |
$config['cert'] = $config['system']['cert']; |
|
| 2156 |
} |
|
| 2157 |
} |
|
| 2158 |
|
|
| 2149 | 2159 |
?> |
Also available in: Unified diff
Moving certs and ca out from under system. Provide upgrade code to move existing certs.