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

rename 'MySQL User' to 'Froxlor Customer' as username for users read from db via libnss; fix language strings

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-11 21:21:09 +01:00
parent b0279025d0
commit 74b73c6446
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/configfiles/gentoo.xml
View File

@@ -2869,12 +2869,12 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600" <file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
backup="true"> backup="true">
<content><![CDATA[ <content><![CDATA[
getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE uid='%1$u' \ WHERE uid='%1$u' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
@@ -2884,7 +2884,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users FROM ftp_users
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users FROM ftp_users

11
lib/configfiles/precise.xml
View File

@@ -1433,12 +1433,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600" <file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
backup="true"> backup="true">
<content><![CDATA[ <content><![CDATA[
getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE uid='%1$u' \ WHERE uid='%1$u' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
@@ -1448,7 +1448,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users FROM ftp_users
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users FROM ftp_users
@@ -1477,6 +1477,11 @@ socket /var/run/mysqld/mysqld.sock
]]> ]]>
</content> </content>
</file> </file>
<command>
<!-- if a socket is set for the db-server use it -->
<visibility mode="notempty">{{sql.socket}}</visibility>
<content><![CDATA[sed -i.bak \'s|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|\' /etc/libnss-mysql.cfg]]></content>
</command>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root" <file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0600" backup="true"> chmod="0600" backup="true">
<content><![CDATA[ <content><![CDATA[

6
lib/configfiles/rhel_centos.xml
View File

@@ -2305,12 +2305,12 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600" <file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
backup="true"> backup="true">
<content><![CDATA[ <content><![CDATA[
getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE uid='%1$u' \ WHERE uid='%1$u' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
@@ -2320,7 +2320,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users FROM ftp_users
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users FROM ftp_users

6
lib/configfiles/trusty.xml
View File

@@ -1411,12 +1411,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600" <file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
backup="true"> backup="true">
<content><![CDATA[ <content><![CDATA[
getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE uid='%1$u' \ WHERE uid='%1$u' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
@@ -1426,7 +1426,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users FROM ftp_users
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users FROM ftp_users

6
lib/configfiles/wheezy.xml
View File

@@ -4766,12 +4766,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600" <file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
backup="true"> backup="true">
<content><![CDATA[ <content><![CDATA[
getpwnam SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwuid SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users \ FROM ftp_users \
WHERE uid='%1$u' \ WHERE uid='%1$u' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
@@ -4781,7 +4781,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \ WHERE username='%1$s' \
AND login_enabled = 'Y' \ AND login_enabled = 'Y' \
LIMIT 1 LIMIT 1
getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ getpwent SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
FROM ftp_users FROM ftp_users
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users FROM ftp_users

4
lng/english.lng.php
View File

@@ -1839,5 +1839,5 @@ $lng['error']['fcgidandphpfpmnogoodtogether'] = 'FCGID and PHP-FPM cannot be act
// Added in Froxlor 0.9.34 // Added in Froxlor 0.9.34
$lng['admin']['configfiles']['legend'] = 'You are about to configure a service/daemon. The following legend explains the nomenclature.'; $lng['admin']['configfiles']['legend'] = 'You are about to configure a service/daemon. The following legend explains the nomenclature.';
$lng['admin']['configfiles']['commands'] = '<span class="red">Commands:</span> These commands are to be executed line by line as root-user in a shell.<br>It is safe to copy the whole block and paste it into the shell.'; $lng['admin']['configfiles']['commands'] = '<span class="red">Commands:</span> These commands are to be executed line by line as root-user in a shell. It is safe to copy the whole block and paste it into the shell.';
$lng['admin']['configfiles']['files'] = '<span class="red">Configfiles:</span> This is an example of the contents of a configuration file.<br>The commands before these textfields should open an editor with the target file.<br>Just copy and paste the contents into the editor and save the file.<br><br><span class="red">Please note:</span> The MySQL-password has not been replaced for security reasons. Please replace "MYSQL_PASSWORD" on your own. If you forgot your MySQL-password you\'ll find it in "lib/userdata.inc.php"'; $lng['admin']['configfiles']['files'] = '<span class="red">Configfiles:</span> This is an example of the contents of a configuration file. The commands before these textfields should open an editor with the target file. Just copy and paste the contents into the editor and save the file.<br><br><span class="red">Please note:</span> The MySQL-password has not been replaced for security reasons. Please replace "MYSQL_PASSWORD" on your own. If you forgot your MySQL-password you\'ll find it in "lib/userdata.inc.php"';

6
lng/german.lng.php
View File

@@ -1565,6 +1565,6 @@ $lng['serversettings']['system_send_cron_errors']['description'] = 'Gib an, ob b
$lng['error']['fcgidandphpfpmnogoodtogether'] = 'FCGID und PHP-FPM können nicht gleichzeitig aktiviert werden.'; $lng['error']['fcgidandphpfpmnogoodtogether'] = 'FCGID und PHP-FPM können nicht gleichzeitig aktiviert werden.';
// Added in Froxlor 0.9.34 // Added in Froxlor 0.9.34
$lng['admin']['configfiles']['legend'] = 'Du konfigurierst nun einen Service/Daemon. Die folgende Legende zeigen unsere Nomenklatur.'; $lng['admin']['configfiles']['legend'] = 'Du konfigurierst nun einen Service/Daemon. Die folgende Legende zeigt unsere Nomenklatur.';
$lng['admin']['configfiles']['commands'] = '<span class="red">Kommandos:</span> Die angezeigten Befehle müssen als Benutzer root in einer Shell ausgeführt werden.<br>Es kann auch problemlos der ganze Block kopiert und in die Shell eingefügt werden.'; $lng['admin']['configfiles']['commands'] = '<span class="red">Kommandos:</span> Die angezeigten Befehle müssen als Benutzer root in einer Shell ausgeführt werden. Es kann auch problemlos der ganze Block kopiert und in die Shell eingefügt werden.';
$lng['admin']['configfiles']['files'] = '<span class="red">Konfigurationsdateien:</span> Dies ist der Inhalt einer Konfigurationsdatei.<br />Der Befehl direkt vor dem Textfeld sollte einen Editor mit der Zeildatei öffnen.<br>Der Inhalt kann nun einfach kopiert und in den Editor eingefügt und die Datei gespeichert werden.<br><br><span class="red">Beachten Sie:</span> Das MySQL-Passwort wurde aus Sicherheitsgründen nicht ersetzt. Bitte ersetzen Sie "MYSQL_PASSWORD" manuell durch das entsprechende Passwort. Falls Sie es vergessen haben sollten, finden Sie es in der Datei "lib/userdata.inc.php".'; $lng['admin']['configfiles']['files'] = '<span class="red">Konfigurationsdateien:</span> Dies ist der Inhalt einer Konfigurationsdatei. Der Befehl direkt vor dem Textfeld sollte einen Editor mit der Zeildatei öffnen. Der Inhalt kann nun einfach kopiert und in den Editor eingefügt und die Datei gespeichert werden.<br><br><span class="red">Beachten Sie:</span> Das MySQL-Passwort wurde aus Sicherheitsgründen nicht ersetzt. Bitte ersetzen Sie "MYSQL_PASSWORD" manuell durch das entsprechende Passwort. Falls Sie es vergessen haben sollten, finden Sie es in der Datei "lib/userdata.inc.php".';