From 42d201448dc54a3ddb2d2ace19f60c54c9be4918 Mon Sep 17 00:00:00 2001 From: TJ Saunders Date: Sun, 14 Aug 2016 12:15:21 -0700 Subject: [PATCH] Removing more links to the castaglia.org site from the documentation. --- doc/contrib/mod_quotatab_sql.html | 16 +++------------- doc/contrib/mod_sftp_sql.html | 10 +++++----- doc/howto/AuthFiles.html | 21 +++++++++------------ doc/howto/ConnectionACLs.html | 10 +++------- doc/howto/DNS.html | 16 +++++++--------- doc/howto/Directory.html | 8 ++++---- doc/howto/Quotas.html | 19 +++++-------------- doc/howto/Stopping.html | 9 +++------ doc/howto/VirtualUsers.html | 12 +++--------- 9 files changed, 42 insertions(+), 79 deletions(-) diff --git a/doc/contrib/mod_quotatab_sql.html b/doc/contrib/mod_quotatab_sql.html index dd1d5d5ec6..ae555138f5 100644 --- a/doc/contrib/mod_quotatab_sql.html +++ b/doc/contrib/mod_quotatab_sql.html @@ -1,6 +1,3 @@ - - - ProFTPD module mod_quotatab_sql @@ -119,7 +116,7 @@

Thanks

Also note that SQL-based tally tables have an issue with proper synchronization of updates, especially when multiple sessions involving the same tally are ocurring. In order to prevent the tally table from becoming out of -sync, you are strongly encouraged to define a QuotaLock +sync, you are strongly encouraged to define a QuotaLock file.

@@ -279,19 +276,12 @@

Thanks

calculations. NULL values should be avoided whenever possible.

-


- -Author: $Author: castaglia $
-Last Updated: $Date: 2013-08-14 21:40:18 $
- -
- +
© Copyright 2000-2003 TJ Saunders
All Rights Reserved
 - -

+
diff --git a/doc/contrib/mod_sftp_sql.html b/doc/contrib/mod_sftp_sql.html index ba8f580093..a54005537b 100644 --- a/doc/contrib/mod_sftp_sql.html +++ b/doc/contrib/mod_sftp_sql.html @@ -12,11 +12,11 @@

ProFTPD module mod_sftp_sql


-The mod_sftp module for ProFTPD can support different storage formats for -its user- and host-based authorized keys. By default, the mod_sftp -module supports storing authorized keys in flats. This -mod_sftp_sql module allows for authorized SSH keys to be stored -in SQL tables. +The mod_sftp module for +ProFTPD can support different storage formats for its user- and host-based +authorized keys. By default, the mod_sftp module supports storing +authorized keys in flat files. This mod_sftp_sql module allows +for authorized SSH keys to be stored in SQL tables.

This module is contained in the mod_sftp_sql.c file for diff --git a/doc/howto/AuthFiles.html b/doc/howto/AuthFiles.html index 3dec3e9fc9..23bd39b46b 100644 --- a/doc/howto/AuthFiles.html +++ b/doc/howto/AuthFiles.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - Using AuthUserFiles +ProFTPD: Using AuthUserFiles

-

Using AuthUserFiles

+

ProFTPD: Using AuthUserFiles

@@ -46,12 +43,11 @@ /etc/passwd, not instead of it (prior to 1.2.8rc1, however, an AuthUserFile was used instead of /etc/passwd); similarly for AuthGroupFile and /etc/group. The -AuthOrder directive can be used if -you want proftpd to use only the AuthUserFile. The -format of an AuthUserFile is the same as /etc/passwd -(man passwd(5)), and the format of an AuthGroupFile -is the same as /etc/group (man group(5)). There is -an ftpasswd script available that can be used to create and update +AuthOrder directive can be used if you want proftpd to use only the AuthUserFile. +The format of an AuthUserFile is the same as +/etc/passwd (man passwd(5)), and the format of an +AuthGroupFile is the same as /etc/group (man +group(5)). There is an ftpasswd script available that can be used to create and update these files.

@@ -71,7 +67,8 @@ 

   groupname:grouppasswd:gid:member1,member2,...memberN
-The ftpasswd script mentioned creates files in these required formats. +The ftpasswd script +mentioned creates files in these required formats.

Choice of IDs
diff --git a/doc/howto/ConnectionACLs.html b/doc/howto/ConnectionACLs.html index 161fb05f7f..af4b5e813c 100644 --- a/doc/howto/ConnectionACLs.html +++ b/doc/howto/ConnectionACLs.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - Connection ACLs +ProFTPD: Connection ACLs

-

Connection ACLs

+

ProFTPD: Connection ACLs

@@ -186,8 +183,7 @@

And if you find yourself starting to block large blocks of addresses from countries/regions, you should start thinking about connection ACLs in terms of -geolocation information. For this, the mod_geoip module for proftpd is -quite useful. +geolocation information. For this, the mod_geoip module for ProFTPD is quite useful.

Frequently Asked Questions
diff --git a/doc/howto/DNS.html b/doc/howto/DNS.html index 1fb3b7da20..72d5dea1f3 100644 --- a/doc/howto/DNS.html +++ b/doc/howto/DNS.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - DNS +ProFTPD: DNS

-

ProFTPD and DNS

+

ProFTPD: DNS

@@ -58,8 +55,9 @@ the name displayed by typing `hostname`. Why does proftpd need to know this? There is always at least one server that proftpd will handle: the "server config" -server (see the virtual host howto). This "server config" -server defaults to the IP address of the hostname of the machine. +server (see the virtual host howto). This +"server config" server defaults to the IP address of the hostname of +the machine.

Once proftpd has the complete list of IP addresses with which @@ -146,12 +144,12 @@ To specify the desired IP address, use -S when starting proftpd, e.g.: 

-  /usr/local/sbin/proftpd -S 1.2.3.4 ...
+  $ /usr/local/sbin/proftpd -S 1.2.3.4 ...
And if you want proftpd to listen on all interfaces, you can specify a wildcard socket using an IP address of 0.0.0.0: 
-  /usr/local/sbin/proftpd -S 0.0.0.0 ...
+  $ /usr/local/sbin/proftpd -S 0.0.0.0 ...

diff --git a/doc/howto/Directory.html b/doc/howto/Directory.html index 332ba86d17..febdfe611b 100644 --- a/doc/howto/Directory.html +++ b/doc/howto/Directory.html @@ -147,10 +147,10 @@ subdirectories of the given directory, upload/.

-Also, it is good to keep in mind the similarity between a -<Directory> section and a .ftpaccess file. -In some cases, using .ftpaccess files might be more convenient. -The +Also, it is good to keep in mind the similarity +between a <Directory> section and a .ftpaccess +file. In some cases, using .ftpaccess files might be more +convenient. The AllowOverride configuration directive (which first appeared in the 1.2.7rc1 release) provides fine-grained control over when .ftpaccess files will be honored. diff --git a/doc/howto/Quotas.html b/doc/howto/Quotas.html index 0b4c78e347..36786da2b1 100644 --- a/doc/howto/Quotas.html +++ b/doc/howto/Quotas.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - Quotas +ProFTPD: Quotas

-

ProFTPD Quotas

+

ProFTPD: Quotas

@@ -53,20 +50,14 @@ QuotaLog /var/log/ftpd/quota.log # For more information on using files for storing the limit and tally - # table quota data, please see the mod_quotatab_file documentation: - # - # http://www.castaglia.org/proftpd/modules/mod_quotatab_file.html - # + # table quota data, please see the mod_quotatab_file documentation. <IfModule mod_quotatab_file.c> QuotaLimitTable file:/etc/ftpd/ftpquota.limittab QuotaTallyTable file:/etc/ftpd/ftpquota.tallytab </IfModule> # For more information on using a SQL database for storing the limit and - # tally table quota data, please see the mod_quotatab_file documentation: - # - # http://www.castaglia.org/proftpd/modules/mod_quotatab_sql.html - # + # tally table quota data, please see the mod_quotatab_sql documentation <IfModule mod_quotatab_sql.c> SQLNamedQuery get-quota-limit SELECT "* FROM quotalimits WHERE name = '%{0}' AND quota_type = '%{1}'" SQLNamedQuery get-quota-tally SELECT "* FROM quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'" @@ -185,7 +176,7 @@

Question: How do I construct the limit and tally files for file-based quotas?
-Answer: There is a Perl script called ftpquota which +Answer: There is a Perl script called ftpquota which can create the necessary files. This script can also be found under the contrib/ directory of the proftpd source distribution. diff --git a/doc/howto/Stopping.html b/doc/howto/Stopping.html index 7c07289606..89cfe2a28e 100644 --- a/doc/howto/Stopping.html +++ b/doc/howto/Stopping.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - Stopping and Starting +ProFTPD: Stopping and Starting

-

Stopping and Starting ProFTPD

+

ProFTPD: Stopping and Starting

@@ -290,7 +287,7 @@

Read ftpshut's -man page +man page for more detailed information on its usage.

diff --git a/doc/howto/VirtualUsers.html b/doc/howto/VirtualUsers.html index e505b109c3..e99846a71b 100644 --- a/doc/howto/VirtualUsers.html +++ b/doc/howto/VirtualUsers.html @@ -1,15 +1,12 @@ - - - -ProFTPD mini-HOWTO - ProFTPD Virtual Users +ProFTPD: Virtual Users

-

ProFTPD Virtual Users

+

ProFTPD: Virtual Users

@@ -124,10 +121,7 @@ The ftpasswd tool is a Perl script, distributed with the ProFTPD source code, under the contrib/ directory. A copy -can also be found online: -

-  http://www.castaglia.org/proftpd/contrib/ftpasswd
-
+can also be found on GitHub.

Another very popular authentication mechanism used for virtual users is a SQL