You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/02/12 20:27:03 UTC
svn commit: r506620 - in /incubator/ftpserver/trunk/distribution/res:
conf/ftpd.properties conf/ftpd.xml ftp-db.sql
Author: ngn
Date: Mon Feb 12 12:27:02 2007
New Revision: 506620
URL: http://svn.apache.org/viewvc?view=rev&rev=506620
Log:
Updated SQL example with missing columns and default values
Updated config examples with data source for DbUserManager
Modified:
incubator/ftpserver/trunk/distribution/res/conf/ftpd.properties
incubator/ftpserver/trunk/distribution/res/conf/ftpd.xml
incubator/ftpserver/trunk/distribution/res/ftp-db.sql
Modified: incubator/ftpserver/trunk/distribution/res/conf/ftpd.properties
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/res/conf/ftpd.properties?view=diff&rev=506620&r1=506619&r2=506620
==============================================================================
--- incubator/ftpserver/trunk/distribution/res/conf/ftpd.properties (original)
+++ incubator/ftpserver/trunk/distribution/res/conf/ftpd.properties Mon Feb 12 12:27:02 2007
@@ -110,20 +110,21 @@
## Properties based default user manager configuration.
##-----------------------------------------------------------------------------
#config.user-manager.class=org.apache.ftpserver.usermanager.PropertiesUserManager
-#config.user-manager.admin=admin
+#config.user-manager.admin-name=admin
#config.user-manager.prop-file=./res/user.gen
-#config.user-manager.prop-password-encrypt=true
+#config.user-manager.encrypt-passwords=true
##-----------------------------------------------------------------------------
## Database based user manager configuration
##-----------------------------------------------------------------------------
#config.user-manager.class=org.apache.ftpserver.usermanager.DbUserManager
-#config.user-manager.admin=admin
-#config.user-manager.jdbc-driver=org.gjt.mm.mysql.Driver
-#config.user-manager.jdbc-url=jdbc\:mysql\://localhost:3306/ftpdb
-#config.user-manager.jdbc-user=user
-#config.user-manager.jdbc-password=password
+#config.user-manager.admin-name=admin
+#config.user-manager.data-source.class=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+#config.user-manager.data-source.server-name=localhost
+#config.user-manager.data-source.database-name=ftpdb
+#config.user-manager.data-source.user=user
+#config.user-manager.data-source.password=password
#config.user-manager.sql-user-insert=INSERT INTO FTP_USER (uid, userpassword, homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate) VALUES ('{uid}', '{userpassword}', '{homedirectory}', '{enableflag}', '{writepermission}', {idletime}, {uploadrate}, {downloadrate})
#config.user-manager.sql-user-update=UPDATE FTP_USER SET userpassword\='{userpassword}',homedirectory\='{homedirectory}',enableflag\='{enableflag}',writepermission\='{writepermission}',idletime\={idletime},uploadrate\={uploadrate},downloadrate\={downloadrate} WHERE uid\='{uid}'
#config.user-manager.sql-user-delete=DELETE FROM FTP_USER WHERE uid \= '{uid}'
@@ -137,7 +138,7 @@
## LDAP based user manager configuration
##-----------------------------------------------------------------------------
#config.user-manager.class=org.apache.ftpserver.usermanager.LdapUserManager
-#config.user-manager.admin=admin
+#config.user-manager.admin-name=admin
#config.user-manager.ldap-url=ldap\://localhost\:389
#config.user-manager.ldap-admin-dn=cn=Manager,dc=apache,dc=org
#config.user-manager.ldap-admin-password=secret
Modified: incubator/ftpserver/trunk/distribution/res/conf/ftpd.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/res/conf/ftpd.xml?view=diff&rev=506620&r1=506619&r2=506620
==============================================================================
--- incubator/ftpserver/trunk/distribution/res/conf/ftpd.xml (original)
+++ incubator/ftpserver/trunk/distribution/res/conf/ftpd.xml Mon Feb 12 12:27:02 2007
@@ -132,9 +132,9 @@
<!-- Default properties file based user manager configuration block
<user-manager>
<class>org.apache.ftpserver.usermanager.PropertiesUserManager</class>
- <admin>admin</admin>
+ <admin-name>admin</admin-name>
<prop-file>./res/user.gen</prop-file>
- <prop-password-encrypt>true</prop-password-encrypt>
+ <encrypt-passwords>true</encrypt-passwords>
</user-manager>
-->
@@ -142,11 +142,14 @@
<!-- Database based user manager configuration
<user-manager>
<class>org.apache.ftpserver.usermanager.DbUserManager</class>
- <admin>admin</admin>
- <jdbc-driver>org.gjt.mm.mysql.Driver</jdbc-driver>
- <jdbc-url>jdbc:mysql://localhost:3306/data</jdbc-url>
- <jdbc-user>user</jdbc-user>
- <jdbc-password>password</jdbc-password>
+ <admin-name>admin</admin-name>
+ <data-source>
+ <class>com.mysql.jdbc.jdbc2.optional.MysqlDataSource</class>
+ <server-name>localhost</server-name>
+ <database-name>ftpdb</database-name>
+ <user>user</user>
+ <password>password</password>
+ </data-source>
<sql-user-insert>INSERT INTO FTP_USER (uid, userpassword, homedirectory, enableflag, writepermission, idletime, uploadrate, downloadrate) VALUES ('{uid}', '{userpassword}', '{homedirectory}', '{enableflag}', '{writepermission}', {idletime}, {uploadrate}, {downloadrate})</sql-user-insert>
<sql-user-update>UPDATE FTP_USER SET userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag='{enableflag}',writepermission='{writepermission}',idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate} WHERE uid='{uid}'</sql-user-update>
<sql-user-delete>DELETE FROM FTP_USER WHERE uid = '{uid}'</sql-user-delete>
@@ -161,7 +164,7 @@
<!-- LDAP based user manager
<user-manager>
<class>org.apache.ftpserver.usermanager.LdapUserManager</class>
- <admin>admin</admin>
+ <admin-name>admin</admin-name>
<ldap-url>ldap://localhost:389</ldap-url>
<ldap-admin-dn>cn=Manager,dc=apache,dc=org</ldap-admin-dn>
<ldap-admin-password>secret</ldap-admin-password>
Modified: incubator/ftpserver/trunk/distribution/res/ftp-db.sql
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/res/ftp-db.sql?view=diff&rev=506620&r1=506619&r2=506620
==============================================================================
--- incubator/ftpserver/trunk/distribution/res/ftp-db.sql (original)
+++ incubator/ftpserver/trunk/distribution/res/ftp-db.sql Mon Feb 12 12:27:02 2007
@@ -1,4 +1,4 @@
--- Licensed to the Apache Software Foundation (ASF) under one
+managermanager-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
@@ -19,9 +19,11 @@
uid VARCHAR(64) NOT NULL PRIMARY KEY,
userpassword VARCHAR(64),
homedirectory VARCHAR(128) NOT NULL,
- enableflag VARCHAR(8) NOT NULL,
- writepermission VARCHAR(8) NOT NULL,
- idletime INT NOT NULL,
- uploadrate INT NOT NULL,
- downloadrate INT NOT NULL
-)
+ enableflag BOOLEAN DEFAULT TRUE,
+ writepermission BOOLEAN DEFAULT FALSE,
+ idletime INT DEFAULT 0,
+ uploadrate INT DEFAULT 0,
+ downloadrate INT DEFAULT 0,
+ maxloginnumber INT DEFAULT 0,
+ maxloginperip INT DEFAULT 0
+);