diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-02 17:01:26 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-02 17:01:26 -0500 |
| commit | 367e08b09a9c10b1e475cb00abda5c0ce8147510 (patch) | |
| tree | 0eb7f4719917aa3ed1ffdb27cda323ff32e9fe82 | |
| parent | 02b383fedd526e7015708f2df47905372fcd5437 (diff) | |
| download | pfsense-367e08b09a9c10b1e475cb00abda5c0ce8147510.zip pfsense-367e08b09a9c10b1e475cb00abda5c0ce8147510.tar.gz | |
Shorten output string. Setup crt
| -rw-r--r-- | etc/inc/system.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 9be9a3f..2e760d6 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -627,7 +627,7 @@ function system_webgui_start() { // Ensure that we have a webConfigurator CERT $cert =& lookup_cert($config['system']['webgui']['ssl-certref']); if(!is_array($cert) && !$cert['crt'] && !$cert['prv']) { - echo "Importaing default SSL Certificate for webConfigurator..."; + echo "Importaing default SSL Certificate..."; $cert_file = "/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.crt"; $key_file = "/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.key"; if(file_exists($cert_file && $key_file)) { @@ -639,6 +639,11 @@ function system_webgui_start() { $a_cert[] = $cert; $config['system']['webgui']['ssl-certref'] = $cert['refid']; write_config("Importing default HTTPS certificate from /etc/default_ssl_certs/"); + $crt = base64_decode($cert['crt']); + $key = base64_decode($cert['prv']); + if(!$config['system']['webgui']['port']) + $portarg = "443"; + $ca = ca_chain($cert); echo "Done.\n"; } else { log_error("ERROR: Could not locate a default certificate file in /etc/default_ssl/certs/ for import $cert_file - $key_file"); |
