wtserver 0.57

distros/debian12/install_antivirus.sh

@@ -28,14 +28,9 @@ InstallAntiVirus() {
     if [[ "$(which named)" == "" ]]; then
 	apt_install unbound
     fi
-    #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
-
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/rspamd-archive-keyring.gpg] http://rspamd.com/apt-stable/ $(lsb_release -c -s) main" | 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" | 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_gitlab.sh

@@ -39,10 +39,10 @@ InstallGitlabCE() {
     #certbot certonly --agree-tos --non-interactive --renew-by-default --standalone --email wolftronics@arbajnok.hu -d gitlab.arbajnok.hu
 
     mkdir -p /etc/gitlab/ssl/
-    openssl dhparam -out /etc/gitlab/ssl/dhparams.pem 2048
+    hide_output openssl dhparam -out /etc/gitlab/ssl/dhparams.pem 2048
 
     #gitlab-rake gitlab:setup #esetleg kell az admin jelszóhoz
-    gitlab-ctl reconfigure
+    gitlab-ctl reconfigure >> $PROGRAMS_INSTALL_LOG_FILES 2>&1
 
     #apt_install ruby
     #gem install rubygems-update
@@ -237,15 +237,15 @@ EOF
 	sh /root/.acme.sh/acme.sh --issue --standalone -d gitlab.$CFG_HOSTNAME_DOMAIN --force
     else
 	#cp -av /home/administrator/wtlinux_server_setup/acme_ssl/arbajnok/gitlab.$CFG_HOSTNAME_DOMAIN /home/administrator/.acme.sh/
-	cp -av /home/administrator/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/gitlab.$CFG_HOSTNAME_DOMAIN /root/.acme.sh/
+	cp -av /home/$SUDO_USER/wtlinux_server_setup/acme_ssl/$CFG_HOSTNAME_DOMAIN/gitlab.$CFG_HOSTNAME_DOMAIN /root/.acme.sh/
     fi
 
     systemctl restart nginx
 
-    cat >> /home/administrator/wtlinux_server_setup/wtserver_configuration.txt <<EOF
+    cat >> /home/$SUDO_USER/wtlinux_server_setup/wtserver_configuration.txt <<EOF
 # Gitlab sever root admin passwords
 #----------------------------
-Mysql root password		: $CFG_GITLAB_ADMIN_PWD
+Gitlab mysql root password		: $CFG_GITLAB_ADMIN_PWD
 #----------------------------
 EOF
 

distros/debian12/install_mysql.sh

@@ -154,16 +154,9 @@ default-authentication-plugin=mysql_native_password
 	echo -e "[${green}DONE${NC}]"
 
 	echo -n -e "$IDENTATION_LVL_1 Installing MariaDB Server & Client... "
-	apt_install software-properties-common dirmngr apt-transport-https
-	#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_install software-properties-common dirmngr apt-transport-https	
+	curl -fsSL 'https://mariadb.org/mariadb_release_signing_key.asc' | gpg --dearmor | 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" | tee /etc/apt/sources.list.d/mariadb.list > /dev/null
 	apt_update
 	apt_install mariadb-client mariadb-server
 	echo -e "[${green}DONE${NC}]"