fix a bunch of svn props (no functional changes):
- add svn:eol-style native where needed, seems that we forgot some files last time - nuke svn:keywords from some files where it is not used
This commit is contained in:
Robert Foerster (Dessa)
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
|
||||
#
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||
#
|
||||
# Regular cron jobs for the froxlor package
|
||||
#
|
||||
*/5 * * * * root /usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/froxlor_master_cronjob.php
|
||||
#
|
||||
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
|
||||
#
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||
#
|
||||
# Regular cron jobs for the froxlor package
|
||||
#
|
||||
*/5 * * * * root /usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/froxlor_master_cronjob.php
|
||||
|
||||
@@ -1,64 +1,64 @@
|
||||
queue_directory = /var/spool/postfix
|
||||
command_directory = /usr/sbin
|
||||
daemon_directory = /usr/lib/postfix
|
||||
mail_owner = postfix
|
||||
inet_interfaces = all
|
||||
unknown_local_recipient_reject_code = 550
|
||||
debug_peer_level = 2
|
||||
debugger_command =
|
||||
PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
|
||||
xxgdb $daemon_directory/$process_name $process_id & sleep 5
|
||||
sendmail_path = /usr/sbin/sendmail
|
||||
newaliases_path = /usr/bin/newaliases
|
||||
mailq_path = /usr/bin/mailq
|
||||
setgid_group = maildrop
|
||||
html_directory = /usr/share/doc/packages/postfix/html
|
||||
manpage_directory = /usr/share/man
|
||||
sample_directory = /usr/share/doc/packages/postfix/samples
|
||||
readme_directory = /usr/share/doc/packages/postfix/README_FILES
|
||||
inet_protocols = all
|
||||
biff = no
|
||||
append_dot_mydomain = no
|
||||
mail_spool_directory = /var/mail
|
||||
canonical_maps = hash:/etc/postfix/canonical
|
||||
virtual_mailbox_base = /var/kunden/mail/
|
||||
virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
|
||||
virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
|
||||
virtual_alias_domains =
|
||||
virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
|
||||
virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
|
||||
virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
|
||||
virtual_maps = hash:/etc/postfix/virtual
|
||||
relocated_maps = hash:/etc/postfix/relocated
|
||||
transport_maps = hash:/etc/postfix/transport
|
||||
sender_canonical_maps = hash:/etc/postfix/sender_canonical
|
||||
masquerade_exceptions = root
|
||||
masquerade_classes = envelope_sender, header_sender, header_recipient
|
||||
myhostname = <SERVERNAME>
|
||||
mydomain = <SERVERNAME>
|
||||
program_directory = /usr/lib/postfix
|
||||
masquerade_domains =
|
||||
mydestination = $myhostname $mydomain localhost localhost.$mydomain
|
||||
mynetworks = 127.0.0.0/8
|
||||
defer_transports =
|
||||
disable_dns_lookups = no
|
||||
relayhost =
|
||||
mailbox_command =
|
||||
mailbox_transport =
|
||||
strict_8bitmime = no
|
||||
disable_mime_output_conversion = no
|
||||
smtpd_client_restrictions =
|
||||
smtpd_helo_required = no
|
||||
smtpd_helo_restrictions =
|
||||
strict_rfc821_envelopes = no
|
||||
smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination
|
||||
smtpd_sasl_auth_enable = yes
|
||||
smtpd_sasl_local_domain = $myhostname
|
||||
smtpd_sasl_security_options = noanonymous
|
||||
broken_sasl_auth_clients = yes
|
||||
#smtpd_use_tls = no
|
||||
#smtp_use_tls = no
|
||||
alias_maps = $alias_database
|
||||
mailbox_size_limit = 0
|
||||
virtual_mailbox_limit = 0
|
||||
queue_directory = /var/spool/postfix
|
||||
command_directory = /usr/sbin
|
||||
daemon_directory = /usr/lib/postfix
|
||||
mail_owner = postfix
|
||||
inet_interfaces = all
|
||||
unknown_local_recipient_reject_code = 550
|
||||
debug_peer_level = 2
|
||||
debugger_command =
|
||||
PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
|
||||
xxgdb $daemon_directory/$process_name $process_id & sleep 5
|
||||
sendmail_path = /usr/sbin/sendmail
|
||||
newaliases_path = /usr/bin/newaliases
|
||||
mailq_path = /usr/bin/mailq
|
||||
setgid_group = maildrop
|
||||
html_directory = /usr/share/doc/packages/postfix/html
|
||||
manpage_directory = /usr/share/man
|
||||
sample_directory = /usr/share/doc/packages/postfix/samples
|
||||
readme_directory = /usr/share/doc/packages/postfix/README_FILES
|
||||
inet_protocols = all
|
||||
biff = no
|
||||
append_dot_mydomain = no
|
||||
mail_spool_directory = /var/mail
|
||||
canonical_maps = hash:/etc/postfix/canonical
|
||||
virtual_mailbox_base = /var/kunden/mail/
|
||||
virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
|
||||
virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
|
||||
virtual_alias_domains =
|
||||
virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
|
||||
virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
|
||||
virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
|
||||
virtual_maps = hash:/etc/postfix/virtual
|
||||
relocated_maps = hash:/etc/postfix/relocated
|
||||
transport_maps = hash:/etc/postfix/transport
|
||||
sender_canonical_maps = hash:/etc/postfix/sender_canonical
|
||||
masquerade_exceptions = root
|
||||
masquerade_classes = envelope_sender, header_sender, header_recipient
|
||||
myhostname = <SERVERNAME>
|
||||
mydomain = <SERVERNAME>
|
||||
program_directory = /usr/lib/postfix
|
||||
masquerade_domains =
|
||||
mydestination = $myhostname $mydomain localhost localhost.$mydomain
|
||||
mynetworks = 127.0.0.0/8
|
||||
defer_transports =
|
||||
disable_dns_lookups = no
|
||||
relayhost =
|
||||
mailbox_command =
|
||||
mailbox_transport =
|
||||
strict_8bitmime = no
|
||||
disable_mime_output_conversion = no
|
||||
smtpd_client_restrictions =
|
||||
smtpd_helo_required = no
|
||||
smtpd_helo_restrictions =
|
||||
strict_rfc821_envelopes = no
|
||||
smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination
|
||||
smtpd_sasl_auth_enable = yes
|
||||
smtpd_sasl_local_domain = $myhostname
|
||||
smtpd_sasl_security_options = noanonymous
|
||||
broken_sasl_auth_clients = yes
|
||||
#smtpd_use_tls = no
|
||||
#smtp_use_tls = no
|
||||
alias_maps = $alias_database
|
||||
mailbox_size_limit = 0
|
||||
virtual_mailbox_limit = 0
|
||||
message_size_limit = 10240000
|
||||
@@ -1,8 +1,8 @@
|
||||
user = <SQL_UNPRIVILEGED_USER>
|
||||
password = <SQL_UNPRIVILEGED_PASSWORD>
|
||||
dbname = <SQL_DB>
|
||||
table = mail_virtual
|
||||
select_field = destination
|
||||
where_field = email
|
||||
additional_conditions = and TRIM(destination) <> ''
|
||||
hosts = <SQL_HOST>
|
||||
user = <SQL_UNPRIVILEGED_USER>
|
||||
password = <SQL_UNPRIVILEGED_PASSWORD>
|
||||
dbname = <SQL_DB>
|
||||
table = mail_virtual
|
||||
select_field = destination
|
||||
where_field = email
|
||||
additional_conditions = and TRIM(destination) <> ''
|
||||
hosts = <SQL_HOST>
|
||||
|
||||
@@ -1,69 +1,69 @@
|
||||
Include /etc/proftpd/modules.conf
|
||||
|
||||
ServerName "<SERVERNAME> FTP Server"
|
||||
ServerType standalone
|
||||
DeferWelcome off
|
||||
|
||||
MultilineRFC2228 on
|
||||
DefaultServer on
|
||||
ShowSymlinks on
|
||||
AllowOverwrite on
|
||||
|
||||
TimeoutNoTransfer 600
|
||||
TimeoutStalled 600
|
||||
TimeoutIdle 1200
|
||||
|
||||
DisplayLogin welcome.msg
|
||||
DisplayChdir .message
|
||||
ListOptions "-l"
|
||||
|
||||
DenyFilter \*.*/
|
||||
|
||||
Port 21
|
||||
MaxInstances 30
|
||||
UseIPv6 off
|
||||
|
||||
TransferLog /var/log/proftpd/xferlog
|
||||
SystemLog /var/log/proftpd/proftpd.log
|
||||
|
||||
# make proftpd faster / do not perform ident and reverse dns lookup
|
||||
UseReverseDNS off
|
||||
|
||||
# Set the user and group that the server normally runs at.
|
||||
User nobody
|
||||
Group nogroup
|
||||
|
||||
<Directory /*>
|
||||
# Umask 022 is a good standard umask to prevent new files and dirs
|
||||
# (second parm) from being group and world writable.
|
||||
Umask 022 022
|
||||
# Normally, we want files to be overwriteable.
|
||||
AllowOverwrite on
|
||||
</Directory>
|
||||
|
||||
<Global>
|
||||
# CH-Root all users
|
||||
DefaultRoot ~
|
||||
# Reject rootlogin (just for security)
|
||||
RootLogin off
|
||||
# Noo need to require valid shell, because user is virtual
|
||||
RequireValidShell off
|
||||
</Global>
|
||||
|
||||
AuthOrder mod_sql.c
|
||||
|
||||
SQLAuthTypes Crypt Plaintext
|
||||
SQLAuthenticate users* groups*
|
||||
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
|
||||
SQLUserInfo ftp_users username password uid gid homedir shell
|
||||
SQLGroupInfo ftp_groups groupname gid members
|
||||
SQLUserWhereClause "login_enabled = 'y'"
|
||||
|
||||
SQLLog PASS login
|
||||
SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog RETR download
|
||||
SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog STOR upload
|
||||
SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
|
||||
Include /etc/proftpd/modules.conf
|
||||
|
||||
ServerName "<SERVERNAME> FTP Server"
|
||||
ServerType standalone
|
||||
DeferWelcome off
|
||||
|
||||
MultilineRFC2228 on
|
||||
DefaultServer on
|
||||
ShowSymlinks on
|
||||
AllowOverwrite on
|
||||
|
||||
TimeoutNoTransfer 600
|
||||
TimeoutStalled 600
|
||||
TimeoutIdle 1200
|
||||
|
||||
DisplayLogin welcome.msg
|
||||
DisplayChdir .message
|
||||
ListOptions "-l"
|
||||
|
||||
DenyFilter \*.*/
|
||||
|
||||
Port 21
|
||||
MaxInstances 30
|
||||
UseIPv6 off
|
||||
|
||||
TransferLog /var/log/proftpd/xferlog
|
||||
SystemLog /var/log/proftpd/proftpd.log
|
||||
|
||||
# make proftpd faster / do not perform ident and reverse dns lookup
|
||||
UseReverseDNS off
|
||||
|
||||
# Set the user and group that the server normally runs at.
|
||||
User nobody
|
||||
Group nogroup
|
||||
|
||||
<Directory /*>
|
||||
# Umask 022 is a good standard umask to prevent new files and dirs
|
||||
# (second parm) from being group and world writable.
|
||||
Umask 022 022
|
||||
# Normally, we want files to be overwriteable.
|
||||
AllowOverwrite on
|
||||
</Directory>
|
||||
|
||||
<Global>
|
||||
# CH-Root all users
|
||||
DefaultRoot ~
|
||||
# Reject rootlogin (just for security)
|
||||
RootLogin off
|
||||
# Noo need to require valid shell, because user is virtual
|
||||
RequireValidShell off
|
||||
</Global>
|
||||
|
||||
AuthOrder mod_sql.c
|
||||
|
||||
SQLAuthTypes Crypt Plaintext
|
||||
SQLAuthenticate users* groups*
|
||||
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
|
||||
SQLUserInfo ftp_users username password uid gid homedir shell
|
||||
SQLGroupInfo ftp_groups groupname gid members
|
||||
SQLUserWhereClause "login_enabled = 'y'"
|
||||
|
||||
SQLLog PASS login
|
||||
SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog RETR download
|
||||
SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog STOR upload
|
||||
SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
Reference in New Issue
Block a user