Fixed: FS#2478 - apache ssl certificate issue on multi server environment -...

tbrehm

2012-10-19 2d4162dd3e81a9e981560b37098339b1b532251e

Fixed: FS#2478 - apache ssl certificate issue on multi server environment
- Added missing language strings to german language file.

 interface/web/mail/lib/lang/de.lng

@@ -37,6 +37,7 @@
$wb['Server Settings'] = "Servereinstellungen";
$wb['Fetchmail'] = "E-Mail Sammeldienst";
$wb['Mailbox traffic'] = "E-Mail Konto Datenverkehr";
$wb['Mailbox quota'] = "E-Mail Konto Belegung";
$wb['Statistics'] = "Statistiken";
$wb['Postfix Whitelist'] = "Postfix Whitelist";
$wb['Postfix Blacklist'] = "Postfix Blacklist";

 interface/web/sites/lib/lang/de_aps.lng

@@ -28,7 +28,7 @@
$wb['install_location_txt'] = 'Installationsort';
$wb['btn_install_txt'] = 'Installieren';
$wb['btn_cancel_txt'] = 'Abbrechen';
$wb['acceptance_txt'] = 'Lizenzvereinbarung';
$wb['acceptance_txt'] = 'Lizenzvereinbarung akzeptieren';
$wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.';
$wb['install_language_txt'] = 'Sprache der Oberfläche';
$wb['new_database_password_txt'] = 'Datenbank Passwort';

 server/plugins-available/apache2_plugin.inc.php

@@ -115,8 +115,8 @@
        $csr_file = $ssl_dir.'/'.$domain.'.csr';
        $crt_file = $ssl_dir.'/'.$domain.'.crt';

        //* Create a SSL Certificate
        if($data['new']['ssl_action'] == 'create') {
        //* Create a SSL Certificate, but only if this is not a mirror server.
        if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
            
            $this->ssl_certificate_changed = true;
            

 server/plugins-available/nginx_plugin.inc.php

@@ -115,7 +115,7 @@
        $crt_file = $ssl_dir.'/'.$domain.'.crt';

        //* Create a SSL Certificate
        if($data['new']['ssl_action'] == 'create') {
        if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
        
            $this->ssl_certificate_changed = true;