maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #300 from Froxlor/revert-299-master

Browse Source 
Revert "Changes in the config templates"
This commit is contained in:
Michael Kaufmann
2016-02-20 15:25:47 +01:00
parent be1a12821e 8a99bd1d51
commit 0935a9c193
6 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/configfiles/gentoo.xml
View File

@@ -2892,7 +2892,6 @@ AllowRetrieveRestart on
ListOptions "-al" ListOptions "-al"
DisplayChdir .message DisplayChdir .message
UseIPv6 off UseIPv6 off
RLimitChroot off
# Modules settings # Modules settings
#DelayEngine off #DelayEngine off

5
lib/configfiles/jessie.xml
View File

@@ -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 # matches the local IP (ie. you're connecting from the same computer), the
# connection is considered secure and plaintext authentication is allowed. # connection is considered secure and plaintext authentication is allowed.
# See also ssl=required setting. # See also ssl=required setting.
# enable plaintext #disable_plaintext_auth = yes
disable_plaintext_auth = no
# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that # 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. # 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 # To really apply changes, reload proftpd after modifications, if
# it runs in daemon mode. It is not required in inetd/xinetd mode. # it runs in daemon mode. It is not required in inetd/xinetd mode.
# #
RLimitChroot off
# Includes DSO modules # Includes DSO modules
Include /etc/proftpd/modules.conf Include /etc/proftpd/modules.conf

4
lib/configfiles/precise.xml
View File

@@ -843,7 +843,7 @@ service auth {
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # 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 # matches the local IP (ie. you're connecting from the same computer), the
# connection is considered secure and plaintext authentication is allowed. # 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 # 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. # 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. # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
# To really apply changes reload proftpd after modifications. # To really apply changes reload proftpd after modifications.
# #
RLimitChroot off
# Includes DSO modules # Includes DSO modules
Include /etc/proftpd/modules.conf Include /etc/proftpd/modules.conf

3
lib/configfiles/rhel_centos.xml
View File

@@ -1829,8 +1829,7 @@ iterate_query = SELECT username AS user FROM mail_users
# This is the ProFTPD configuration file # This is the ProFTPD configuration file
# #
# See: http://www.proftpd.org/docs/directives/linked/by-name.html # See: http://www.proftpd.org/docs/directives/linked/by-name.html
#
RLimitChroot off
# Security-Enhanced Linux (SELinux) Notes: # Security-Enhanced Linux (SELinux) Notes:
# #
# In Fedora and Red Hat Enterprise Linux, ProFTPD runs confined by SELinux # In Fedora and Red Hat Enterprise Linux, ProFTPD runs confined by SELinux

4
lib/configfiles/trusty.xml
View File

@@ -859,7 +859,7 @@ service auth {
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP # 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 # matches the local IP (ie. you're connecting from the same computer), the
# connection is considered secure and plaintext authentication is allowed. # 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 # 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. # 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. # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
# To really apply changes reload proftpd after modifications. # To really apply changes reload proftpd after modifications.
# #
RLimitChroot off
# Includes DSO modules # Includes DSO modules
Include /etc/proftpd/modules.conf Include /etc/proftpd/modules.conf

2
lib/configfiles/wheezy.xml
View File

@@ -4389,7 +4389,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
# To really apply changes, reload proftpd after modifications, if # To really apply changes, reload proftpd after modifications, if
# it runs in daemon mode. It is not required in inetd/xinetd mode. # it runs in daemon mode. It is not required in inetd/xinetd mode.
# #
RLimitChroot off
# Includes DSO modules # Includes DSO modules
Include /etc/proftpd/modules.conf Include /etc/proftpd/modules.conf