From 8a99bd1d51692ce98153d2d0f89d0a9a0dd419f1 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sat, 20 Feb 2016 15:24:51 +0100 Subject: [PATCH] Revert "Changes in the config templates" --- lib/configfiles/gentoo.xml | 1 - lib/configfiles/jessie.xml | 5 ++--- lib/configfiles/precise.xml | 4 ++-- lib/configfiles/rhel_centos.xml | 3 +-- lib/configfiles/trusty.xml | 4 ++-- lib/configfiles/wheezy.xml | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 8d17e0ca..f0bd4723 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -2892,7 +2892,6 @@ AllowRetrieveRestart on ListOptions "-al" DisplayChdir .message UseIPv6 off -RLimitChroot off # Modules settings #DelayEngine off diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index 9b552ee7..5cb2e296 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -2195,8 +2195,7 @@ password_query = SELECT username AS user, password_enc AS password, CONCAT(homed # matches the local IP (ie. you're connecting from the same computer), the # connection is considered secure and plaintext authentication is allowed. # See also ssl=required setting. -# enable plaintext -disable_plaintext_auth = no +#disable_plaintext_auth = yes # Authentication cache size (e.g. 10M). 0 means it's disabled. Note that # bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. @@ -3285,7 +3284,7 @@ plugin { # To really apply changes, reload proftpd after modifications, if # it runs in daemon mode. It is not required in inetd/xinetd mode. # -RLimitChroot off + # Includes DSO modules Include /etc/proftpd/modules.conf diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index 54082917..18bb165b 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -843,7 +843,7 @@ service auth { # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # matches the local IP (ie. you're connecting from the same computer), the # connection is considered secure and plaintext authentication is allowed. -disable_plaintext_auth = no +#disable_plaintext_auth = yes # Authentication cache size (e.g. 10M). 0 means it's disabled. Note that # bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. @@ -1105,7 +1105,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. # To really apply changes reload proftpd after modifications. # -RLimitChroot off + # Includes DSO modules Include /etc/proftpd/modules.conf diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 375f4831..37d58363 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -1829,8 +1829,7 @@ iterate_query = SELECT username AS user FROM mail_users # This is the ProFTPD configuration file # # See: http://www.proftpd.org/docs/directives/linked/by-name.html -# -RLimitChroot off + # Security-Enhanced Linux (SELinux) Notes: # # In Fedora and Red Hat Enterprise Linux, ProFTPD runs confined by SELinux diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 9b54fcdd..d5640c40 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -859,7 +859,7 @@ service auth { # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # matches the local IP (ie. you're connecting from the same computer), the # connection is considered secure and plaintext authentication is allowed. -disable_plaintext_auth = no +#disable_plaintext_auth = yes # Authentication cache size (e.g. 10M). 0 means it's disabled. Note that # bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. @@ -1108,7 +1108,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file. # To really apply changes reload proftpd after modifications. # -RLimitChroot off + # Includes DSO modules Include /etc/proftpd/modules.conf diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 68fa6292..d4ef0af4 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -4389,7 +4389,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3) # To really apply changes, reload proftpd after modifications, if # it runs in daemon mode. It is not required in inetd/xinetd mode. # -RLimitChroot off + # Includes DSO modules Include /etc/proftpd/modules.conf