wtserver 0.56

distros/debian12/install_antivirus.sh

@@ -28,9 +28,14 @@ InstallAntiVirus() {
     if [[ "$(which named)" == "" ]]; then
 	apt_install unbound
     fi
-    hide_output curl https://rspamd.com/apt-stable/gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/rspamd.gpg
-    echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/rspamd.gpg] http://rspamd.com/apt-stable/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/rspamd.list
-    echo "deb-src [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/rspamd.gpg] http://rspamd.com/apt-stable/ $(lsb_release -cs) main" >> /etc/apt/sources.list.d/rspamd.list
+    #curl https://rspamd.com/apt-stable/gpg.key | apt-key add -
+    #echo "deb [arch=amd64] http://rspamd.com/apt-stable/ $(lsb_release -c -s) main" > /etc/apt/sources.list.d/rspamd.list
+    #echo "deb-src [arch=amd64] http://rspamd.com/apt-stable/ $(lsb_release -c -s) main" -s>> /etc/apt/sources.list.d/rspamd.list
+
+    curl -fsSL https://rspamd.com/apt-stable/gpg.key | gpg --dearmor | tee /usr/share/keyrings/rspamd-archive-keyring.gpg > /dev/null
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/rspamd-archive-keyring.gpg] http://rspamd.com/apt-stable/ $(lsb_release -c -s) main" | sudo tee /etc/apt/sources.list.d/rspamd.list > /dev/null
+    echo "deb-src [arch=amd64 signed-by=/usr/share/keyrings/rspamd-archive-keyring.gpg] http://rspamd.com/apt-stable/ $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list.d/rspamd.list > /dev/null
+
     apt_update
     apt_install rspamd
     echo 'servers = "127.0.0.1";' > /etc/rspamd/local.d/redis.conf

distros/debian12/install_mailman.sh

@@ -9,7 +9,7 @@ InstallMailman() {
     echo "mailman mailman/default_server_language select en" | debconf-set-selections
     echo "mailman mailman/site_languages  multiselect en" | debconf-set-selections
     echo "mailman mailman/create_site_list select " | debconf-set-selections
-    apt_install mailman
+    apt_install mailman3
     mmsitepass "${MMSITEPASS}"
     newlist -a  mailman "${MMLISTOWNER}" "${MMADMINEMAIL}" "${MMLISTPASS}" | grep "/var/lib/mailman" >> /etc/aliases
     newaliases

distros/debian12/install_mysql.sh

@@ -155,8 +155,15 @@ default-authentication-plugin=mysql_native_password
 
 	echo -n -e "$IDENTATION_LVL_1 Installing MariaDB Server & Client... "
 	apt_install software-properties-common dirmngr apt-transport-https
-	hide_output curl https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/mariadb.gpg
-	echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mariadb.gpg] http://mariadb.mirrors.ovh.net/MariaDB/repo/11.8.1/debian $(lsb_release -cs) main" > /etc/apt/sources.list.d/mariadb.list
+	#apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+	#yes | add-apt-repository 'deb [arch=amd64] http://mariadb.mirrors.ovh.net/MariaDB/repo/11.8.1/debian bookworm main' >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
+
+	#hide_output curl https://mariadb.org/mariadb_release_signing_key.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/mariadb.gpg
+	#echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mariadb.gpg] http://mariadb.mirrors.ovh.net/MariaDB/repo/11.8.1/debian $(lsb_release -cs) main" > /etc/apt/sources.list.d/mariadb.list
+	
+	curl -fsSL 'https://mariadb.org/mariadb_release_signing_key.asc' | gpg --dearmor | sudo tee /usr/share/keyrings/mariadb-archive-keyring.gpg > /dev/null
+	echo "deb [arch=amd64 signed-by=/usr/share/keyrings/mariadb-archive-keyring.gpg] http://mariadb.mirrors.ovh.net/MariaDB/repo/11.8.1/debian $(lsb_release -c -s) main" | sudo tee /etc/apt/sources.list.d/mariadb.list > /dev/null
+
 	apt_update
 	apt_install mariadb-client mariadb-server
 	echo -e "[${green}DONE${NC}]"