Commit 668ba095 authored by tbrehm's avatar tbrehm

Improved SSL certificate creation.

parent 1e1f85f3
...@@ -110,6 +110,13 @@ class apache2_plugin { ...@@ -110,6 +110,13 @@ class apache2_plugin {
//* Create a SSL Certificate //* Create a SSL Certificate
if($data['new']['ssl_action'] == 'create') { if($data['new']['ssl_action'] == 'create') {
//* Rename files if they exist
if(file_exists($key_file)) rename($key_file,$key_file.'.bak');
if(file_exists($key_file2)) rename($key_file2,$key_file2.'.bak');
if(file_exists($csr_file)) rename($csr_file,$csr_file.'.bak');
if(file_exists($crt_file)) rename($crt_file,$crt_file.'.bak');
$rand_file = $ssl_dir.'/random_file'; $rand_file = $ssl_dir.'/random_file';
$rand_data = md5(uniqid(microtime(),1)); $rand_data = md5(uniqid(microtime(),1));
for($i=0; $i<1000; $i++) { for($i=0; $i<1000; $i++) {
...@@ -133,11 +140,11 @@ class apache2_plugin { ...@@ -133,11 +140,11 @@ class apache2_plugin {
output_password = $ssl_password output_password = $ssl_password
[ req_distinguished_name ] [ req_distinguished_name ]
C = ".$data['new']['ssl_country']." C = ".trim($data['new']['ssl_country'])."
ST = ".$data['new']['ssl_state']." ST = ".trim($data['new']['ssl_state'])."
L = ".$data['new']['ssl_locality']." L = ".trim($data['new']['ssl_locality'])."
O = ".$data['new']['ssl_organisation']." O = ".trim($data['new']['ssl_organisation'])."
OU = ".$data['new']['ssl_organisation_unit']." OU = ".trim($data['new']['ssl_organisation_unit'])."
CN = $domain CN = $domain
emailAddress = webmaster@".$data['new']['domain']." emailAddress = webmaster@".$data['new']['domain']."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment