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"
backup="true">
<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 \
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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 \
WHERE uid='%1$u' \
AND login_enabled = 'Y' \
@@ -2884,7 +2884,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
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"
backup="true">
<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 \
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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 \
WHERE uid='%1$u' \
AND login_enabled = 'Y' \
@@ -1448,7 +1448,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users
@@ -1477,6 +1477,11 @@ socket /var/run/mysqld/mysqld.sock
]]>
</content>
</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"
chmod="0600" backup="true">
<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"
backup="true">
<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 \
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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 \
WHERE uid='%1$u' \
AND login_enabled = 'Y' \
@@ -2320,7 +2320,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
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"
backup="true">
<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 \
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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 \
WHERE uid='%1$u' \
AND login_enabled = 'Y' \
@@ -1426,7 +1426,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
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"
backup="true">
<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 \
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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 \
WHERE uid='%1$u' \
AND login_enabled = 'Y' \
@@ -4781,7 +4781,7 @@ getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999'
WHERE username='%1$s' \
AND login_enabled = 'Y' \
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
getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \
FROM ftp_users