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

Merge pull request #192 from Commifreak/master

Browse Source 
Minor fixes
This commit is contained in:
Michael Kaufmann
2014-05-24 08:39:42 +02:00
parent 92f9cf3621 67bee6d620
commit 0574a9733c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/configfiles/wheezy.inc.php
View File

@@ -441,6 +441,9 @@ return array(
(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'useradd -s /bin/false -g '.Settings::Get('phpfpm.vhost_httpgroup').' '.Settings::Get('phpfpm.vhost_httpuser') : null,
(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'chown -R '.Settings::Get('phpfpm.vhost_httpuser').':'.Settings::Get('phpfpm.vhost_httpgroup').' '.FROXLOR_INSTALL_DIR : null,
(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'a2dismod php5' : null
),
'restart' => array(
'/etc/init.d/apache2 restart'
)
)
)

2
lng/german.lng.php
View File

@@ -1250,7 +1250,7 @@ $lng['extras']['htpasswdauthname'] = 'Grund der Authentifizierung (AuthName)';
$lng['extras']['directoryprotection_edit'] = 'Verzeichnisschutz bearbeiten';
$lng['admin']['templates']['forgotpwd'] = 'Benachrichtigungs-Mails bei Zurücksetzen des Passworts';
$lng['admin']['templates']['password_reset'] = 'Kunden-Benachrichtigung nach Zurücksetzen des Passworts';
$lng['admin']['store_defaultindex'] = 'Standard-Index-Datei im Kundenordner erstellen?';
$lng['admin']['store_defaultindex'] = 'Standard-Index-Datei im Kundenordner erstellen';
// ADDED IN FROXLOR 0.9.14
$lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Voreingestellte PHP-Konfiguration für den Froxlor-Vhost';