From e8299927e968aad7569034d16e6cade06159ec97 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Wed, 22 Aug 2007 22:32:12 +0000
Subject: [PATCH] Fixing etch ftp configuration, Fixes #1046

---
 .gitattributes                             |  1 +
 etc/alternc/templates/proftpd/modules.conf | 31 ++++++++++++++++++++++
 etc/alternc/templates/proftpd/proftpd.conf |  9 +++++--
 install/alternc.install                    |  6 ++---
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 etc/alternc/templates/proftpd/modules.conf

diff --git a/.gitattributes b/.gitattributes
index e29e9f14..a5ddffbd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -287,6 +287,7 @@ etc/alternc/templates/postfix/mydomain.cf -text
 etc/alternc/templates/postfix/mygid.cf -text
 etc/alternc/templates/postfix/myvirtual.cf -text
 etc/alternc/templates/postfix/sasl/smtpd.conf -text
+etc/alternc/templates/proftpd/modules.conf -text
 etc/alternc/templates/proftpd/proftpd.conf -text
 etc/alternc/templates/proftpd/welcome.msg -text
 etc/alternc/templates/squirrelmail/apache.conf -text
diff --git a/etc/alternc/templates/proftpd/modules.conf b/etc/alternc/templates/proftpd/modules.conf
new file mode 100644
index 00000000..4637777c
--- /dev/null
+++ b/etc/alternc/templates/proftpd/modules.conf
@@ -0,0 +1,31 @@
+#
+# This file is used to manage DSO modules and features.
+#
+
+# This is the directory where DSO modules reside
+
+ModulePath /usr/lib/proftpd
+
+# Allow only user root to load and unload modules, but allow everyone
+# to see which modules have been loaded
+
+ModuleControlsACLs insmod,rmmod allow user root
+ModuleControlsACLs lsmod allow user *
+
+
+#LoadModule mod_ctrls_admin.c
+LoadModule mod_tls.c
+LoadModule mod_sql.c
+#LoadModule mod_ldap.c
+LoadModule mod_sql_mysql.c
+#LoadModule mod_sql_postgres.c
+#LoadModule mod_quotatab.c
+#LoadModule mod_quotatab_file.c
+#LoadModule mod_quotatab_ldap.c
+#LoadModule mod_quotatab_sql.c
+#LoadModule mod_radius.c
+LoadModule mod_wrap.c
+LoadModule mod_rewrite.c
+
+# keep this module the last one
+LoadModule mod_ifsession.c
diff --git a/etc/alternc/templates/proftpd/proftpd.conf b/etc/alternc/templates/proftpd/proftpd.conf
index d904375a..99827cfa 100644
--- a/etc/alternc/templates/proftpd/proftpd.conf
+++ b/etc/alternc/templates/proftpd/proftpd.conf
@@ -3,7 +3,12 @@
 # $Id: proftpd.conf,v 1.11 2006/01/17 12:04:14 benjamin Exp $
 # 
 # %%warning_message%%
-# version SARGE
+# version ETCH
+
+#
+# Includes required DSO modules. This is mandatory in proftpd 1.3
+#
+Include /etc/proftpd/modules.conf
 
 ServerName                      "%%hosting%%"
 ServerIdent                     on "FTP Server Ready"
@@ -18,7 +23,7 @@ AllowStoreRestart               on
 DefaultRoot                     ~
 UseReverseDNS                   off
 IdentLookups                    off
-
+UseIPv6 			off
 
 TimeoutNoTransfer               600
 TimeoutStalled                  600
diff --git a/install/alternc.install b/install/alternc.install
index 13a23ea5..3dfb7472 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -31,8 +31,8 @@ if [ -e /etc/postfix/main.cf ]; then
                   etc/postfix/mydomain.cf etc/postfix/mygid.cf
                   etc/postfix/myvirtual.cf etc/postfix/sasl/smtpd.conf"
 fi
-if [ -e /etc/proftpd.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/proftpd.conf etc/welcome.msg"
+if [ -e /etc/proftpd/proftpd.conf ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/proftpd/proftpd.conf etc/proftpd/welcome.msg etc/proftpd/modules.conf"
 fi
 if [ -e /etc/squirrelmail/apache.conf ]; then
     CONFIG_FILES="$CONFIG_FILES etc/squirrelmail/apache.conf"
@@ -201,7 +201,7 @@ if [ -e /etc/courier/authmysqlrc ] ; then
 fi
 
 if [ -e /etc/proftpd.conf ] ; then
-    chmod 640 /etc/proftpd.conf
+    chmod 640 /etc/proftpd/proftpd.conf
 fi
 
 #######################################################################