daily autocommit

diff --git a/clamav/clamd.conf b/clamav/clamd.conf
index a6ad6f2a679b446d520083f44732b5cb45229c0c..69bbbcb3247bdd805644f9ce7fa9d665f4692fed 100644 (file)
--- a/clamav/clamd.conf
+++ b/clamav/clamd.conf
@@ -75,10 +75,10 @@ PCREMaxFileSize 25M
 ScanXMLDOCS true
 ScanHWP3 true
 MaxRecHWP3 16
-StatsEnabled false
-StatsPEDisabled true
-StatsHostID auto
-StatsTimeout 10
+#StatsEnabled false
+#StatsPEDisabled true
+#StatsHostID auto
+#StatsTimeout 10
 StreamMaxLength 25M
 #LogFile /var/log/clamav/clamav.log
 LogTime true

diff --git a/fail2ban/jail.local b/fail2ban/jail.local
index fa877c2f711363fded429ea26cf15b5643186ad4..a0281d6b6c55436d707a30abf3ef3aa254a0fca1 100644 (file)
--- a/fail2ban/jail.local
+++ b/fail2ban/jail.local
@@ -4,7 +4,7 @@
 findtime    = 3600
 bantime     = 86400
 maxretry    = 5
-ignoreip    = 127.0.0.1 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 185.48.118.128 162.254.24.33 185.102.95.107
+ignoreip    = 127.0.0.1 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 185.48.118.128 162.254.24.33 185.102.95.107 136.243.11.239
 
 [sshd]
 enabled     = true
@@ -19,25 +19,25 @@ action      = iptables-multiport[name=sshd-ddos, port="22", protocol=tcp]
 logpath     = /var/log/syslog.d/auth.log
 
 [roundcube-iredmail]
-enabled     = true
+enabled     = false
 filter      = roundcube.iredmail
 action      = iptables-multiport[name=roundcube, port="http,https,smtp,submission,pop3,pop3s,imap,imaps,sieve", protocol=tcp]
 logpath     = /var/log/syslog.d/mail.log
 findtime    = 3600
 
 [dovecot-iredmail]
-enabled     = true
+enabled     = false
 filter      = dovecot.iredmail
 action      = iptables-multiport[name=dovecot, port="http,https,smtp,submission,pop3,pop3s,imap,imaps,sieve", protocol=tcp]
 logpath     = /var/log/dovecot.log
 
 [postfix-iredmail]
-enabled     = true
+enabled     = false
 filter      = postfix.iredmail
 action      = iptables-multiport[name=postfix, port="http,https,smtp,submission,pop3,pop3s,imap,imaps,sieve", protocol=tcp]
 #              sendmail[name=Postfix, dest=root, sender=fail2ban@localhost]
 logpath     = /var/log/syslog.d/mail.log
-ignoreip    = 127.0.0.1 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 185.48.118.128 162.254.24.33 185.102.95.107 144.76.221.187 138.201.28.184
+ignoreip    = 127.0.0.1 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 185.48.118.128 162.254.24.33 185.102.95.107 144.76.221.187 138.201.28.184 136.243.11.239
 
 [sogo-iredmail]
 enabled     = false

diff --git a/logrotate.conf b/logrotate.conf
index 93870432e04c7f99b8d51ecb064f0eff823473b2..c393b3de8da5a40f311fae624d6520bbf45ab51f 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -11,6 +11,10 @@ create
 # uncomment this if you want your log files compressed
 compress
 delaycompress
+missingok
+notifempty
+dateext
+dateformat -%Y-%m-%d
 
 # packages drop log rotation information into this directory
 include /etc/logrotate.d

diff --git a/logrotate.d/alternatives b/logrotate.d/alternatives
index 41c8a9c0a0f0b9836849d374fc0a4356d63fc530..e93576d1644d26341e74f20e632b9c232543ab7b 100644 (file)
--- a/logrotate.d/alternatives
+++ b/logrotate.d/alternatives
@@ -1,9 +1,15 @@
 /var/log/alternatives.log {
-       monthly
-       rotate 12
-       compress
-       delaycompress
-       missingok
-       notifempty
-       create 644 root root
+    monthly
+    rotate 12
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    create 644 root root
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index ee0d3e41906da354e120d6e153183587aa7ea038..20b2b6ecc43922887294980369a911f2ab744003 100644 (file)
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -12,18 +12,4 @@
     olddir /var/log/.old
 }
 
-/var/log/alternatives.log {
-    monthly
-    rotate 12
-    compress
-    delaycompress
-    missingok
-    notifempty
-    size 1M
-    create 644 root root
-    dateext
-    dateformat -%Y-%m-%d
-    olddir /var/log/.old
-}
-
 # vim: ts=4 filetype=conf et

diff --git a/logrotate.d/php7.3-fpm b/logrotate.d/php7.3-fpm
index 124db4083c2bb7ad43ce2e28b48f37729b64162a..7f968d8e90da940a2f6fba2ded75267017165134 100644 (file)
--- a/logrotate.d/php7.3-fpm
+++ b/logrotate.d/php7.3-fpm
@@ -1,6 +1,7 @@
-/var/log/php7.3-fpm.log {
+/var/log/php7.3-fpm.log /var/log/php7.3-fpm/*.log {
        rotate 12
        weekly
+       minsize 1M
        missingok
        notifempty
        compress

diff --git a/motd b/motd
index a57caa262a6c0830196ade62669833468858b923..dc52a739ca47c6319537fc12383d4d7571312f9e 100644 (file)
--- a/motd
+++ b/motd
@@ -6,7 +6,8 @@ Debian GNU/Linux 10 (buster)
 |____/ \__,_|_|  \__,_|_| |_|
                              
 
-Verfolgen sie diesen Anruf und sagen sie mir ... wo zum Himmel bin ich?
+- Schnee, der sich leicht ballen läßt, schmilzt bald.
+               -- Jean Paul
 
-Today is Boomtime, the 10th day of The Aftermath in the YOLD 3185
+Today is Pungenday, the 11th day of The Aftermath in the YOLD 3185
 

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 901e1565900aa42741a4fbd17027233f924f6c9d..d8babfdb0a328f26148f6b86160c57e1ec67677a 100644 (file)
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -28,7 +28,9 @@ http {
        # PHP 5
         #server unix:/var/run/php-fpm.socket;
        # PHP 7.0
-        server unix:/var/run/php/php7.0-fpm.sock;
+        #server unix:/var/run/php/php7.0-fpm.sock;
+       # PHP 7.0
+        server unix:/var/run/php/php7.3-fpm.sock;
     }
 
     include /etc/nginx/conf.d/*.conf;

diff --git a/nginx/sites-available/default b/nginx/sites-available/default
index 10cff2ed48fa7afa5bb28c1e54a3311f18f7c867..20747ebea290d7d5f8a0a9cd7d445ff25c74711a 100644 (file)
--- a/nginx/sites-available/default
+++ b/nginx/sites-available/default
@@ -57,7 +57,7 @@ server {
                include snippets/fastcgi-php.conf;
        
                # With php-fpm (or other unix sockets):
-               fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+               fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
        #       # With php-cgi (or other tcp sockets):
        #       fastcgi_pass 127.0.0.1:9000;
        }

diff --git a/php/7.3/fpm/php-fpm.conf b/php/7.3/fpm/php-fpm.conf
index b45684d957469334de662cde8af22e4e18e51266..8a0b994deb7c9f72d65a45619ab7500571da89cc 100644 (file)
--- a/php/7.3/fpm/php-fpm.conf
+++ b/php/7.3/fpm/php-fpm.conf
@@ -141,3 +141,5 @@ error_log = /var/log/php7.3-fpm.log
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
 include=/etc/php/7.3/fpm/pool.d/*.conf
+
+; vim: filetype=dosini

diff --git a/php/7.3/fpm/pool.d/www.conf b/php/7.3/fpm/pool.d/www.conf
index 8e0e3fbfb3973063888469de3cc04ae6665949f9..9d974a71f1161ee2247f7e60f4fea01dc8ee2438 100644 (file)
--- a/php/7.3/fpm/pool.d/www.conf
+++ b/php/7.3/fpm/pool.d/www.conf
@@ -46,7 +46,7 @@ listen = /run/php/php7.3-fpm.sock
 ;                 mode is set to 0660
 listen.owner = www-data
 listen.group = www-data
-;listen.mode = 0660
+listen.mode = 0660
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.
 ; When set, listen.owner and listen.group are ignored
@@ -235,7 +235,7 @@ pm.max_spare_servers = 3
 ;       anything, but it may not be a good idea to use the .php extension or it
 ;       may conflict with a real PHP file.
 ; Default Value: not set
-;pm.status_path = /status
+pm.status_path = /status
 
 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
 ; URI will be recognized as a ping page. This could be used to test from outside
@@ -256,7 +256,7 @@ pm.max_spare_servers = 3
 
 ; The access log file
 ; Default: not set
-;access.log = log/$pool.access.log
+access.log = /var/log/php7.3-fpm/$pool.access.log
 
 ; The access log format.
 ; The following syntax is allowed
@@ -316,11 +316,13 @@ pm.max_spare_servers = 3
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"
 ;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
 
 ; The log file for slow requests
 ; Default Value: not set
 ; Note: slowlog is mandatory if request_slowlog_timeout is set
 ;slowlog = log/$pool.log.slow
+slowlog = /var/log/php7.3-fpm/$pool.log.slow
 
 ; The timeout for serving a single request after which a PHP backtrace will be
 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
@@ -358,6 +360,7 @@ pm.max_spare_servers = 3
 ;       (error_log, sessions.save_path, ...).
 ; Default Value: not set
 ;chroot =
+chdir = /
 
 ; Chdir to this directory at the start.
 ; Note: relative path can be used.
@@ -428,3 +431,5 @@ pm.max_spare_servers = 3
 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
+
+; vim: filetype=dosini

diff --git a/rc2.d/K01php7.0-fpm b/rc2.d/K01php7.0-fpm
new file mode 120000 (symlink)
index 0000000..e5585cb
--- /dev/null
+++ b/rc2.d/K01php7.0-fpm
@@ -0,0 +1 @@
+../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc2.d/S02php7.0-fpm b/rc2.d/S02php7.0-fpm
deleted file mode 120000 (symlink)
index e5585cb..0000000
--- a/rc2.d/S02php7.0-fpm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc3.d/K01php7.0-fpm b/rc3.d/K01php7.0-fpm
new file mode 120000 (symlink)
index 0000000..e5585cb
--- /dev/null
+++ b/rc3.d/K01php7.0-fpm
@@ -0,0 +1 @@
+../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc3.d/S02php7.0-fpm b/rc3.d/S02php7.0-fpm
deleted file mode 120000 (symlink)
index e5585cb..0000000
--- a/rc3.d/S02php7.0-fpm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc4.d/K01php7.0-fpm b/rc4.d/K01php7.0-fpm
new file mode 120000 (symlink)
index 0000000..e5585cb
--- /dev/null
+++ b/rc4.d/K01php7.0-fpm
@@ -0,0 +1 @@
+../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc4.d/S02php7.0-fpm b/rc4.d/S02php7.0-fpm
deleted file mode 120000 (symlink)
index e5585cb..0000000
--- a/rc4.d/S02php7.0-fpm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc5.d/K01php7.0-fpm b/rc5.d/K01php7.0-fpm
new file mode 120000 (symlink)
index 0000000..e5585cb
--- /dev/null
+++ b/rc5.d/K01php7.0-fpm
@@ -0,0 +1 @@
+../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/rc5.d/S02php7.0-fpm b/rc5.d/S02php7.0-fpm
deleted file mode 120000 (symlink)
index e5585cb..0000000
--- a/rc5.d/S02php7.0-fpm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/php7.0-fpm
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/php7.0-fpm.service b/systemd/system/multi-user.target.wants/php7.0-fpm.service
deleted file mode 120000 (symlink)
index e237023..0000000
--- a/systemd/system/multi-user.target.wants/php7.0-fpm.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/php7.0-fpm.service
\ No newline at end of file