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

Feature: Vhost templates

Browse Source 
Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244
This commit is contained in:
Johannes Feichtner
2016-02-11 23:21:43 +01:00
parent 0559f3c4d6
commit abe253bc31
21 changed files with 761 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lng/english.lng.php
View File

@@ -1969,4 +1969,21 @@ $lng['admin']['server_php'] = 'PHP';
$lng['domains']['termination_date'] = 'Date of termination';
$lng['domains']['termination_date_overview'] = 'canceled until ';
$lng['panel']['set'] = 'Apply';
$lng['panel']['set'] = 'Apply';
// Added for Vhost templates
$lng['menue']['vhostsettings']['maintitle'] = 'VHost Configurations';
$lng['admin']['vhostsettings']['title'] = 'VHost Configuration';
$lng['admin']['vhostsettings']['addnew'] = 'Add new configuration';
$lng['admin']['vhostsettings']['addsettings'] = 'Create a VHost configuration';
$lng['admin']['vhostsettings']['editsettings'] = 'Edit a VHost configuration';
$lng['admin']['vhostsettings']['vhostsettings'] = 'Predefined VHost configuration';
$lng['admin']['vhostsettings']['novhostsettings'] = 'No predefined VHost configuration';
$lng['admin']['vhostconfig']['socket_dir'] = 'Will be replaced with the corresponding Unix socket path, e.g. /var/run/domain-php-fpm.socket.';
$lng['admin']['vhostconfig']['docroot'] = 'Will be replaced with the DocumentRoot.';
$lng['admin']['vhostconfig']['ip'] = 'Will be replaced with the IP address of the Vhost.';
$lng['admin']['vhostconfig']['port'] = 'Will be replaced with the port number of the Vhost.';
$lng['admin']['vhostconfig']['scheme'] = 'Will be set to <strong>http</strong> or <strong>https</strong> in case SSL / TLS is activated for the Vhost.';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Use the standard Vhost location directives';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'If activated, the standard Vhost location directives, such as <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> are excluded from the Vhost configuration file.';
$lng['question']['vhostsetting_reallydelete'] = 'Do you really want to delete the Vhost template?';

19
lng/german.lng.php
View File

@@ -1609,4 +1609,21 @@ $lng['domains']['ssl_redirect_temporarilydisabled'] = "<br>Die SSL-Umleitung ist
$lng['domains']['termination_date'] = 'K&uuml;ndigungsdatum';
$lng['domains']['termination_date_overview'] = 'gek&uuml;ndigt zum ';
$lng['panel']['set'] = 'Setzen';
$lng['panel']['set'] = 'Setzen';
// Added for Vhost templates
$lng['menue']['vhostsettings']['maintitle'] = 'VHost-Konfigurationen';
$lng['admin']['vhostsettings']['title'] = 'VHost-Konfiguration';
$lng['admin']['vhostsettings']['addnew'] = 'Neue Konfiguration erstellen';
$lng['admin']['vhostsettings']['addsettings'] = 'VHost-Konfiguration erstellen';
$lng['admin']['vhostsettings']['editsettings'] = 'VHost-Konfiguration bearbeiten';
$lng['admin']['vhostsettings']['vhostsettings'] = 'Vordefinierte VHost-Konfiguration';
$lng['admin']['vhostsettings']['novhostsettings'] = 'Keine VHost-Konfiguration';
$lng['admin']['vhostconfig']['socket_dir'] = 'Wird mit dem jeweiligen Unix Socket Pfad ersetzt (z.B. /var/run/domain-php-fpm.socket).';
$lng['admin']['vhostconfig']['docroot'] = 'Wird mit dem DocumentRoot ersetzt.';
$lng['admin']['vhostconfig']['ip'] = 'Wird mit der IP-Adresse des Vhosts ersetzt.';
$lng['admin']['vhostconfig']['port'] = 'Wird mit dem Port des Vhosts ersetzt.';
$lng['admin']['vhostconfig']['scheme'] = 'Wird mit <strong>http</strong> bzw. mit <strong>https</strong> ersetzt, sofern der Vhost SSL/TLS aktiviert hat.';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['title'] = 'Standard VHost location-Direktiven verwenden';
$lng['admin']['vhostconfig']['vhost_usedefaultlocation']['desc'] = 'Wenn aktiviert, werden die Standard VHost-Direktiven wie <br>location / { ... }<br> location @rewrites { ... }<br> location ~ ^(.+?\.php)(/.*)?$ { ... }<br> nicht in die Konfigurationsdatei geschrieben.';
$lng['question']['vhostsetting_reallydelete'] = 'Wollen Sie diese VHost-Vorlage wirklich löschen?';