Fixes for bullseye

Author: szepeviktor

debian-setup/packages/_resolv_conf

@@ -3,7 +3,7 @@
 declare -i RESOLVERS="0"
 # See resolv.conf(5)
 declare -i MAXNS="3"
-declare -r EXAMPLECOM_IP="93.184.216.34"
+declare -r EXAMPLECOM_IP="93.184.215.14"
 
 Check_resolver()
 {

debian-setup/packages/mariadb-server

@@ -5,7 +5,7 @@ set -e -x
 Pkg_install_quiet mariadb-server mariadb-client mariadb-backup
 
 # Disable the binary log
-sed -i -e 's/^log_bin/#&/' /etc/mysql/my.cnf
+sed -i -e 's/^log_bin/#&/' /etc/mysql/mariadb.conf.d/50-server.cnf
 
 Dinstall mysql/mysql-optimize.sh
 

mail/courier-config/esmtpd.orig

@@ -24,7 +24,7 @@ MAXDAEMONS=40
 MAXPERC=5
 MAXPERIP=5
 PIDFILE=/run/courier/esmtpd.pid
-TCPDOPTS="-stderrlogger=/usr/sbin/courierlogger"
+TCPDOPTS="-stderrlogger=/usr/sbin/courierlogger -noidentlookup"
 ESMTPAUTH=""
 ESMTPAUTH_WEBADMIN="LOGIN CRAM-MD5 CRAM-SHA1 CRAM-SHA256"
 ESMTPAUTH_TLS=""

monitoring/monit/services/gamin

@@ -5,7 +5,7 @@
    depends on gamin_bin
    depends on gamin_rc
 
- check file gamin_bin with path /usr/lib/gamin/gam_server
+ check file gamin_bin with path /usr/libexec/gam_server
    group system
    include /etc/monit/templates/rootbin
    if does not exist then unmonitor

monitoring/monit/services/mysql-server

@@ -2,9 +2,9 @@
  check process mysqld with pidfile /run/mysqld/mysqld.pid
    group database
    group mysql
-   start program = "/usr/sbin/service mysql start"
-   stop program = "/usr/sbin/service mysql stop"
-   restart program = "/usr/sbin/service mysql restart"
+   start program = "/usr/sbin/service mariadb start"
+   stop program = "/usr/sbin/service mariadb stop"
+   restart program = "/usr/sbin/service mariadb restart"
    if failed host localhost port 3306 protocol mysql username "@@MYSQL_USER@@" password "@@MYSQL_PASS@@"
      with timeout 2 seconds for 3 times within 4 cycles then restart
    if failed unixsocket /run/mysqld/mysqld.sock protocol mysql username "@@MYSQL_USER@@" password "@@MYSQL_PASS@@"
@@ -17,6 +17,6 @@
    group mysql
    include /etc/monit/templates/rootbin
 
- check file mysqld_init with path /etc/init.d/mysql
+ check file mysqld_init with path /etc/init.d/mariadb
    group mysql
    include /etc/monit/templates/rootbin

package/apt-sources/szepeviktor.list

@@ -1,4 +1,4 @@
 # Modern webserver
 deb [arch=amd64] http://szepeviktor.github.io/debian/ bullseye main
-#K: apt-key adv --keyserver keys.openpgp.org --recv-keys 6AA0453C451A4FBA
+#K: wget -qO/etc/apt/trusted.gpg.d/szepeviktor.gpg https://szepeviktor.github.io/szepeviktor.gpg
 #M: https://github.com/szepeviktor/szepeviktor.github.io

repo

@@ -26,8 +26,10 @@ add datacamp 185.240.120.0/23
 add datacamp 193.150.70.0/24
 add datacamp 193.218.190.0/24
 
-# AS206092 - IPXO / SECFIREWALL
+# AS206092 - IPXO / SECFIREWALL / Internet Utilities Europe and Asia
 add datacamp 37.140.223.0/24
+# LAYERSWITCH
+add datacamp 37.140.254.0/24
 # Legaco, Panq
 add datacamp 45.86.200.0/24
 add datacamp 45.92.229.0/24
@@ -41,7 +43,6 @@ add datacamp 172.98.32.0/24
 #add datacamp 185.251.19.0/24
 add datacamp 188.212.135.0/24
 # US-HEAPPLAYER
-add datacamp 192.109.205.0/24
 add datacamp 193.36.224.0/24
 add datacamp 194.169.217.0/24
 # EXTERNAL
@@ -52,6 +53,8 @@ add datacamp 104.234.53.0/24
 add datacamp 216.73.160.0/23
 # US-NYC
 add datacamp 45.8.19.0/24
+# VPN Consumer Washington DC
+add datacamp 136.144.42.0/24
 
 add datacamp 166.1.12.0/24
 add datacamp 191.101.41.0/24

security/myattackers-ipsets/ipset/datacamp.ipset

@@ -25,6 +25,8 @@ CWD="$(dirname "${BASH_SOURCE[0]}")"
 
 # Later versions of Ondřej Surý's PHP-FPM "Depends: systemd | systemd-tmpfiles"
 Pkg_install_quiet systemd-standalone-tmpfiles/bullseye-backports
+# Alternative
+#Pkg_install_quiet opentmpfiles
 
 # @nonDebian
 Pkg_install_quiet "php${PHP}-fpm" libpcre3 \