maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix creating of ssl-redirect without ssl-ip/port, fixes #1303

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-21 08:01:43 +01:00
parent 254672f2dd
commit b8952259ba
6 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lng/english.lng.php
View File

@@ -1969,11 +1969,12 @@ $lng['serversettings']['ssl']['ssl_cipher_list']['title'] = 'Configure the allow
$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'This is a list of ciphers that you want (or don\'t want) to use when talking SSL. For a list of ciphers and how to include/exclude them, see sections "CIPHER LIST FORMAT" and "CIPHER STRINGS" on <a href="http://openssl.org/docs/apps/ciphers.html">the man-page for ciphers</a>.<br /><br /><b>Default value is:</b><pre>ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH</pre>';
// Added in Froxlor 0.9.31
$lng['panel']['dashboard'] = "Dashboard";
$lng['panel']['used'] = "used";
$lng['panel']['assigned'] = "assigned";
$lng['panel']['available'] = "available";
$lng['customer']['services'] = "Services";
$lng['panel']['dashboard'] = 'Dashboard';
$lng['panel']['used'] = 'used';
$lng['panel']['assigned'] = 'assigned';
$lng['panel']['available'] = 'available';
$lng['customer']['services'] = 'Services';
$lng['serversettings']['phpfpm_settings']['ipcdir']['title'] = 'FastCGI IPC directory';
$lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'The directory where the php-fpm sockets will be stored by the webserver.<br />This directory has to be readable for the webserver';
$lng['panel']['news'] = "News";
$lng['panel']['news'] = 'News';
$lng['error']['sslredirectonlypossiblewithsslipport'] = 'Using the SSL redirect is only possible when the domain has at least one ssl-enabled IP/port combination assigned.';

13
lng/german.lng.php
View File

@@ -1695,11 +1695,12 @@ $lng['serversettings']['ssl']['ssl_cipher_list']['title'] = 'Erlaubte SSL Cipher
$lng['serversettings']['ssl']['ssl_cipher_list']['description'] = 'Dies ist eine Liste von Ciphers die genutzt werden sollen (oder auch nicht genutzt werden sollen) wenn eine SSL Verbindung besteht. Eine Liste aller Ciphers und wie diese hinzugefügt/ausgeschlossen werden ist in den Abschnitten "CIPHER LIST FORMAT" und "CIPHER STRINGS" in <a href="http://openssl.org/docs/apps/ciphers.html">der man-page für Ciphers</a> zu finden.<br /><br /><b>Standard-Wert ist:</b><pre>ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH</pre>';
// Added in Froxlor 0.9.31
$lng['panel']['dashboard'] = "Dashboard";
$lng['panel']['used'] = "genutzt";
$lng['panel']['assigned'] = "zugewiesen";
$lng['panel']['available'] = "verfügbar";
$lng['customer']['services'] = "Dienste";
$lng['panel']['dashboard'] = 'Dashboard';
$lng['panel']['used'] = 'genutzt';
$lng['panel']['assigned'] = 'zugewiesen';
$lng['panel']['available'] = 'verfügbar';
$lng['customer']['services'] = 'Dienste';
$lng['serversettings']['phpfpm_settings']['ipcdir']['title'] = 'FastCGI IPC Verzeichnis';
$lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'In dieses Verzeichnis werden die php-fpm Sockets vom Webserver abgelegt.<br />Das Verzeichnis muss für den Webserver lesbar sein.';
$lng['panel']['news'] = "Neuigkeiten";
$lng['panel']['news'] = 'Neuigkeiten';
$lng['error']['sslredirectonlypossiblewithsslipport'] = 'Eine SSL-Weiterleitung ist nur möglich, wenn der Domain mindestens eine IP/Port Kombination zugewiesen wurde, bei der SSL aktiviert ist.';