- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
- You can start again from the home or go back to previous page.
-
-
-
diff --git a/install/debian/12/templates/web/webalizer/webalizer.tpl b/install/debian/12/templates/web/webalizer/webalizer.tpl
deleted file mode 100755
index 068adcfb..00000000
--- a/install/debian/12/templates/web/webalizer/webalizer.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-HostName %domain_idn%
-LogFile /var/log/%web_system%/domains/%domain%.log
-OutputDir %home%/%user%/web/%domain%/stats
-HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist
-Incremental yes
-IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current
-PageType htm*
-PageType cgi
-PageType php
-PageType shtml
-DNSCache /var/lib/webalizer/dns_cache.db
-DNSChildren 10
-Quiet yes
-FoldSeqErr yes
-IndexAlias index.php
-HideURL *.gif
-HideURL *.GIF
-HideURL *.jpg
-HideURL *.JPG
-HideURL *.png
-HideURL *.PNG
-HideURL *.ra
-SearchEngine abcsearch. terms=
-SearchEngine alexa. q=
-SearchEngine alltheweb. q=
-SearchEngine alltheweb. query=
-SearchEngine alot. q=
-SearchEngine altavista. q=
-SearchEngine aolsearch. query=
-SearchEngine aport.ru r=
-SearchEngine ask. q=
-SearchEngine atlas.cz q=
-SearchEngine bbc. q=
-SearchEngine bing. q=
-SearchEngine blingo. q=
-SearchEngine blogs.yandex.ru text=
-SearchEngine btopenworld query=
-SearchEngine buscador.ya.com q=
-SearchEngine busca. q=
-SearchEngine business. query=
-SearchEngine centrum.cz q=
-SearchEngine chiff. q=
-SearchEngine clusty. query=
-SearchEngine comcast. q=
-SearchEngine crawler. q=
-SearchEngine cuil. q=
-SearchEngine dmoz. search=
-SearchEngine dogpile.com q=
-SearchEngine dpxml qkw=
-SearchEngine eureka. searchword=
-SearchEngine euroseek. string=
-SearchEngine exalead. q=
-SearchEngine excite search=
-SearchEngine ezilon. q=
-SearchEngine fastbrowsersearch. q=
-SearchEngine feedster.com q=
-SearchEngine fireball.de q=
-SearchEngine fireball. keyword=
-SearchEngine freeserve. q=
-SearchEngine gigablast. q=
-SearchEngine gogo.ru q=
-SearchEngine go.mail.ru q=
-SearchEngine google. q=
-SearchEngine hakia. q=
-SearchEngine hotbot. query=
-SearchEngine infoseek. qt=
-SearchEngine iwon searchfor=
-SearchEngine ixquick.com query=
-SearchEngine joeant. keywords=
-SearchEngine jyxo.cz s=
-SearchEngine looksmart. key=
-SearchEngine lycos. query=
-SearchEngine mamma. q=
-SearchEngine metacrawler q=
-SearchEngine msn. MT=
-SearchEngine msxml qkw=
-SearchEngine mysearch. searchfor=
-SearchEngine mywebsearch. searchfor=
-SearchEngine netscape. q=
-SearchEngine nigma.ru q=
-SearchEngine northernlight. qr=
-SearchEngine ntlworld. q=
-SearchEngine orange. q=
-SearchEngine overture. Keywords=
-SearchEngine punto.ru text=
-SearchEngine rambler. keyword=
-SearchEngine search.aol. q=
-SearchEngine search.babylon. q=
-SearchEngine search.centrum. phrase=
-SearchEngine search.conduit. q=
-SearchEngine search.earthlink q=
-SearchEngine search.icq. q=
-SearchEngine search.live.com q=
-SearchEngine search.rambler.ru words=
-SearchEngine search.winamp. q=
-SearchEngine searchy. q=
-SearchEngine seznam.cz w=
-SearchEngine snap. query=
-SearchEngine teoma. q=
-SearchEngine teradex.com q=
-SearchEngine ukplus key=
-SearchEngine verizon. q=
-SearchEngine virginmedia. q=
-SearchEngine voila. rdata=
-SearchEngine webcrawler searchText=
-SearchEngine web.search.naver. query=
-SearchEngine wisenut q=
-SearchEngine yahoo. p=
-SearchEngine yandex. text=
-SearchEngine yodao. q=
diff --git a/install/debian/12/vsftpd/vsftpd.conf b/install/debian/12/vsftpd/vsftpd.conf
deleted file mode 100644
index 1ca1a992..00000000
--- a/install/debian/12/vsftpd/vsftpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-anonymous_enable=NO
-local_enable=YES
-write_enable=YES
-local_umask=022
-anon_umask=022
-anon_upload_enable=NO
-dirmessage_enable=YES
-xferlog_enable=YES
-connect_from_port_20=YES
-xferlog_std_format=YES
-dual_log_enable=YES
-chroot_local_user=YES
-listen=YES
-pam_service_name=vsftpd
-userlist_enable=NO
-tcp_wrappers=YES
-force_dot_files=YES
-ascii_upload_enable=YES
-ascii_download_enable=YES
-#allow_writable_chroot=YES
-allow_writeable_chroot=YES
-seccomp_sandbox=NO
-pasv_enable=YES
-pasv_max_port=12100
-pasv_min_port=12000
-use_localtime=YES
diff --git a/install/debian/8/exim/dnsbl.conf b/install/debian/8/exim/dnsbl.conf
index 279bafcd..5166b255 100644
--- a/install/debian/8/exim/dnsbl.conf
+++ b/install/debian/8/exim/dnsbl.conf
@@ -1 +1,2 @@
bl.spamcop.net
+zen.spamhaus.org
diff --git a/install/debian/8/templates/web/awstats/awstats.tpl b/install/debian/8/templates/web/awstats/awstats.tpl
index 6bb51c50..9a92e0fd 100755
--- a/install/debian/8/templates/web/awstats/awstats.tpl
+++ b/install/debian/8/templates/web/awstats/awstats.tpl
@@ -24,7 +24,7 @@ PurgeLogFile=0
ArchiveLogRecords=0
KeepBackupOfHistoricFiles=1
DefaultFile="index.php index.html"
-SkipHosts="127.0.0.1"
+SkipHosts="127.0.0.1
SkipUserAgents=""
SkipFiles=""
SkipReferrersBlackList=""
diff --git a/install/debian/9/exim/dnsbl.conf b/install/debian/9/exim/dnsbl.conf
index 279bafcd..5166b255 100644
--- a/install/debian/9/exim/dnsbl.conf
+++ b/install/debian/9/exim/dnsbl.conf
@@ -1 +1,2 @@
bl.spamcop.net
+zen.spamhaus.org
diff --git a/install/debian/9/templates/web/awstats/awstats.tpl b/install/debian/9/templates/web/awstats/awstats.tpl
index 6bb51c50..9a92e0fd 100755
--- a/install/debian/9/templates/web/awstats/awstats.tpl
+++ b/install/debian/9/templates/web/awstats/awstats.tpl
@@ -24,7 +24,7 @@ PurgeLogFile=0
ArchiveLogRecords=0
KeepBackupOfHistoricFiles=1
DefaultFile="index.php index.html"
-SkipHosts="127.0.0.1"
+SkipHosts="127.0.0.1
SkipUserAgents=""
SkipFiles=""
SkipReferrersBlackList=""
diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index f6de9e70..4349a56d 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -18,21 +18,8 @@ os='debian'
release=$(cat /etc/debian_version | tr "." "\n" | head -n1)
codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
vestacp="$VESTA/install/$VERSION/$release"
-ARCH="amd64"
-if [ "$release" -eq 12 ]; then
- software="nginx apache2 apache2-utils
- libapache2-mod-fcgid php-fpm php
- php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
- vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
- clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
- roundcube-mysql roundcube-plugins mariadb-server mariadb-common
- mariadb-client postgresql postgresql-contrib phpmyadmin mc
- flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota
- e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
- bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl
- unrar-free vim-common net-tools unzip iptables xxd spamd rsyslog"
-elif [ "$release" -eq 11 ]; then
+if [ "$release" -eq 11 ]; then
software="nginx apache2 apache2-utils
libapache2-mod-fcgid php-fpm php
php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
@@ -131,11 +118,7 @@ help() {
# Defining password-gen function
gen_pass() {
MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
- if [ -z "$1" ]; then
- LENGTH=32
- else
- LENGTH=$1
- fi
+ LENGTH=32
while [ ${n:=1} -le $LENGTH ]; do
PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
let n+=1
@@ -290,7 +273,7 @@ set_default_value 'postgresql' 'no'
set_default_value 'mongodb' 'no'
set_default_value 'exim' 'yes'
set_default_value 'dovecot' 'yes'
-if [ $memory -lt 2500000 ]; then
+if [ $memory -lt 1500000 ]; then
set_default_value 'clamd' 'no'
set_default_value 'spamd' 'no'
else
@@ -491,16 +474,10 @@ echo -e "\n\n"
# Asking for confirmation to proceed
if [ "$interactive" = 'yes' ]; then
- prompt_to_continue=1;
- if [ ! -z "$email" ] && [ ! -z "$secret_url" ] && [ ! -z "$port" ] && [ ! -z "$servername" ]; then
- prompt_to_continue=0;
- fi
- if [ $prompt_to_continue -eq 1 ]; then
- read -p 'Would you like to continue [y/n]: ' answer
- if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
- echo 'Goodbye'
- exit 1
- fi
+ read -p 'Would you like to continue [y/n]: ' answer
+ if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
+ echo 'Goodbye'
+ exit 1
fi
# Asking for contact email
@@ -592,19 +569,15 @@ apt-get -y upgrade
check_result $? 'apt-get upgrade failed'
echo "=== Installing nginx repo"
-apt="/etc/apt/sources.list.d"
-# echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list
-# wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
-# apt-key add /tmp/nginx_signing.key
-echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-curl -s https://nginx.org/keys/nginx_signing.key | gpg --dearmor | tee /usr/share/keyrings/nginx-keyring.gpg > /dev/null 2>&1
+apt=/etc/apt/sources.list.d
+echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list
+wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key
+apt-key add /tmp/nginx_signing.key
echo "=== Installing myVesta repo"
-# echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list
-# wget $CHOST/deb_signing.key -O deb_signing.key
-# apt-key add deb_signing.key
-echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/myvesta-keyring.gpg] https://$RHOST/$codename/ $codename vesta" > $apt/vesta.list
-curl -s $CHOST/deb_signing.key | gpg --dearmor | tee /usr/share/keyrings/myvesta-keyring.gpg > /dev/null 2>&1
+echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list
+wget $CHOST/deb_signing.key -O deb_signing.key
+apt-key add deb_signing.key
# Installing jessie backports
if [ "$release" -eq 8 ]; then
@@ -759,37 +732,31 @@ if [ "$mysql" = 'no' ]; then
fi
if [ "$mysql8" = 'yes' ]; then
echo "=== Preparing MySQL 8 apt repo"
- if [ "$release" -lt 12 ]; then
- software=$(echo "$software" | sed -e 's/exim4-daemon-heavy//')
- software=$(echo "$software" | sed -e 's/exim4//')
- #software="$software php-mysql roundcube-mysql"
- echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###" > /etc/apt/sources.list.d/mysql.list
- echo "# You may comment out entries below, but any other modifications may be lost." >> /etc/apt/sources.list.d/mysql.list
- echo "# Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications." >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
- echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-tools" >> /etc/apt/sources.list.d/mysql.list
- echo "#deb http://repo.mysql.com/apt/debian/ $codename mysql-tools-preview" >> /etc/apt/sources.list.d/mysql.list
- echo "deb-src http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
-
- # apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29
- key="467B942D3A79BD29"
- readonly key
- GNUPGHOME="$(mktemp -d)"
- export GNUPGHOME
- for keyserver in $(shuf -e ha.pool.sks-keyservers.net hkp://p80.pool.sks-keyservers.net:80 keyserver.ubuntu.com hkp://keyserver.ubuntu.com:80)
- do
- gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
- done
- gpg --export "${key}" > /etc/apt/trusted.gpg.d/mysql.gpg
- gpgconf --kill all
- rm -rf "${GNUPGHOME}"
- unset GNUPGHOME
- else
- # check latest on: https://dev.mysql.com/downloads/repo/apt/
- wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
- dpkg -i mysql-apt-config_0.8.34-1_all.deb
- fi
+ software=$(echo "$software" | sed -e 's/exim4-daemon-heavy//')
+ software=$(echo "$software" | sed -e 's/exim4//')
+ #software="$software php-mysql roundcube-mysql"
+ echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###" > /etc/apt/sources.list.d/mysql.list
+ echo "# You may comment out entries below, but any other modifications may be lost." >> /etc/apt/sources.list.d/mysql.list
+ echo "# Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications." >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-tools" >> /etc/apt/sources.list.d/mysql.list
+ echo "#deb http://repo.mysql.com/apt/debian/ $codename mysql-tools-preview" >> /etc/apt/sources.list.d/mysql.list
+ echo "deb-src http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
+
+ # apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29
+ key="467B942D3A79BD29"
+ readonly key
+ GNUPGHOME="$(mktemp -d)"
+ export GNUPGHOME
+ for keyserver in $(shuf -e ha.pool.sks-keyservers.net hkp://p80.pool.sks-keyservers.net:80 keyserver.ubuntu.com hkp://keyserver.ubuntu.com:80)
+ do
+ gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
+ done
+ gpg --export "${key}" > /etc/apt/trusted.gpg.d/mysql.gpg
+ gpgconf --kill all
+ rm -rf "${GNUPGHOME}"
+ unset GNUPGHOME
mpass=$(gen_pass)
debconf-set-selections <<< "mysql-community-server mysql-community-server/root-pass password $mpass"
@@ -854,12 +821,6 @@ fi
echo "=== Enabling daemon autostart"
rm -f /usr/sbin/policy-rc.d
-if [ "$release" -gt 11 ]; then
- echo "=== Setting up rsyslog"
- currentservice='rsyslog'
- ensure_startup $currentservice
- ensure_start $currentservice
-fi
#----------------------------------------------------------#
# Configure system #
@@ -961,7 +922,7 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf
echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf
echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf
- if [ "$release" -gt 8 ]; then
+ if [ "$release" -eq 9 ] || [ "$release" -eq 10 ] || [ "$release" -eq 11 ]; then
if [ "$phpfpm" = 'yes' ]; then
echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf
fi
@@ -993,11 +954,7 @@ if [ "$exim" = 'yes' ]; then
echo "ANTIVIRUS_SYSTEM='clamav-daemon'" >> $VESTA/conf/vesta.conf
fi
if [ "$spamd" = 'yes' ]; then
- if [ "$release" -lt 12 ]; then
- echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf
- else
- echo "ANTISPAM_SYSTEM='spamd'" >> $VESTA/conf/vesta.conf
- fi
+ echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf
fi
if [ "$dovecot" = 'yes' ]; then
echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf
@@ -1067,22 +1024,6 @@ if [ "$release" -eq 11 ]; then
ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.stpl
ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.tpl
fi
-if [ "$release" -eq 12 ]; then
- echo "== Symlink missing templates"
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl
- ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/default.sh
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl
- ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl
-
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.stpl
- ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.tpl
-fi
echo "== Set nameservers address"
sed -i "s/YOURHOSTNAME1/ns1.$servername/" /usr/local/vesta/data/packages/default.pkg
@@ -1104,17 +1045,12 @@ $VESTA/bin/v-change-sys-hostname $servername 2>/dev/null
echo "== Generating myVesta unsigned SSL certificate"
$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
- 'San Francisco' 'myVesta Control Panel' 'IT' > /tmp/vst.pem
+ 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
# Parsing certificate file
crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:)
-if [ "$release" -lt 12 ]; then
- key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:)
- key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:)
-else
- key_start=$(grep -n "BEGIN PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:)
- key_end=$(grep -n "END PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:)
-fi
+key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:)
+key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:)
cd $VESTA/ssl
sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt
@@ -1134,9 +1070,7 @@ if [ "$nginx" = 'yes' ]; then
cp -f $vestacp/nginx/nginx.conf /etc/nginx/
cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/
cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/
- if [ "$release" -lt 12 ]; then
- cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/
- fi
+ cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/
cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/
cp -f $vestacp/logrotate/nginx /etc/logrotate.d/
@@ -1200,13 +1134,7 @@ fi
if [ "$phpfpm" = 'yes' ]; then
echo "=== Configure PHP-FPM"
- if [ "$release" -eq 12 ]; then
- cp -f $vestacp/php-fpm/www.conf /etc/php/8.2/fpm/pool.d/www.conf
- #update-rc.d php8.2-fpm defaults
- currentservice='php8.2-fpm'
- ensure_startup $currentservice
- ensure_start $currentservice
- elif [ "$release" -eq 11 ]; then
+ if [ "$release" -eq 11 ]; then
cp -f $vestacp/php-fpm/www.conf /etc/php/7.4/fpm/pool.d/www.conf
#update-rc.d php7.4-fpm defaults
currentservice='php7.4-fpm'
@@ -1279,12 +1207,6 @@ if [ "$proftpd" = 'yes' ]; then
currentservice='proftpd'
ensure_startup $currentservice
ensure_start $currentservice
-
- # Temporary ProFTPD fix for Debian12
- if [ "$release" -eq 12 ]; then
- systemctl disable --now proftpd.socket
- systemctl enable --now proftpd.service
- fi
fi
@@ -1382,11 +1304,8 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
bash /root/phpmyadmin/pma.sh
blowfish=$(gen_pass)
echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php
-
- # disable root login
- echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php
fi
- if [ "$release" -gt 10 ]; then
+ if [ "$release" -eq 11 ]; then
echo "=== Configure phpMyAdmin (Debian11 custom part)"
# Set config and log directory
sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
@@ -1402,9 +1321,6 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
bash /root/phpmyadmin/pma.sh
blowfish=$(gen_pass)
echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php
-
- # disable root login
- echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php
fi
fi
@@ -1422,12 +1338,10 @@ if [ "$postgresql" = 'yes' ]; then
sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'"
# Configuring phpPgAdmin
- if [ "$release" -lt 12 ]; then
- if [ "$apache" = 'yes' ]; then
- cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/
- fi
- cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/
+ if [ "$apache" = 'yes' ]; then
+ cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/
fi
+ cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/
fi
@@ -1448,7 +1362,7 @@ if [ "$named" = 'yes' ]; then
sed -i "s#/etc/bind/\*\* r,#/etc/bind/\*\* rw,\n /home/\*\* rwm,#g" /etc/apparmor.d/usr.sbin.named
# service apparmor status >/dev/null 2>&1
# if [ $? -ne 0 ]; then
- systemctl restart apparmor
+ service apparmor restart
# fi
fi
# update-rc.d bind9 defaults
@@ -1469,10 +1383,6 @@ if [ "$exim" = 'yes' ]; then
cp -f $vestacp/exim/spam-blocks.conf /etc/exim4/
cp -f $vestacp/exim/deny_senders /etc/exim4/
touch /etc/exim4/white-blocks.conf
- touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour
- touch /etc/exim4/limit_per_email_account_max_recipients
- touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour
- touch /etc/exim4/limit_per_hosting_account_max_recipients
if [ "$spamd" = 'yes' ]; then
sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template
@@ -1481,12 +1391,6 @@ if [ "$exim" = 'yes' ]; then
sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
fi
- # Generating SRS KEY - the code is taken from HestiaCP
- srs=$(gen_pass 16)
- echo $srs > /etc/exim4/srs.conf
- chmod 640 /etc/exim4/srs.conf
- chown root:Debian-exim /etc/exim4/srs.conf
-
chmod 640 /etc/exim4/exim4.conf.template
rm -rf /etc/exim4/domains
mkdir -p /etc/exim4/domains
@@ -1501,8 +1405,7 @@ if [ "$exim" = 'yes' ]; then
#update-rc.d exim4 defaults
currentservice='exim4'
ensure_startup $currentservice
- systemctl restart $currentservice
- # ensure_start $currentservice
+ ensure_start $currentservice
fi
@@ -1572,33 +1475,12 @@ fi
if [ "$spamd" = 'yes' ]; then
echo "=== Configure SpamAssassin"
#update-rc.d spamassassin defaults
- if [ "$release" -lt 12 ]; then
- sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin
- currentservice='spamassassin'
- else
- currentservice='spamd'
- fi
-
- echo "=== Creating spamassassin /nonexistent folder"
- mkdir /nonexistent
- mkdir /nonexistent/.spamassassin
- chown -R nobody:debian-spamd /nonexistent
-
- echo "=== Patching spamassassin dns_server"
- sed -i "s/report_safe 1/report_safe 1\n\ndns_server 127.0.0.1/g" /etc/spamassassin/local.cf
-
- echo "== Adding myVesta rules to SpamAssassin"
- cat < /etc/spamassassin/myvesta.cf
-score RCVD_IN_RP_SAFE 0
-score RCVD_IN_RP_CERTIFIED 0
-score SPF_FAIL 3.0
-score SPF_SOFTFAIL 4.0
-score SPF_NONE 4.0
-EOF
-
+ sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin
wget -nv -O /etc/spamassassin/barracuda.cf http://c.myvestacp.com/tools/spamassassin/barracuda.cf
+ currentservice='spamassassin'
ensure_startup $currentservice
- systemctl restart $currentservice
+ # ensure_start $currentservice
+ systemctl restart spamassassin
fi
@@ -1636,12 +1518,14 @@ if [ "$exim" = 'yes' ] && { [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; } the
/etc/roundcube/plugins/password/config.inc.php
mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
chmod a+r /etc/roundcube/main.inc.php
- mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php
- mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php
- chmod 640 /etc/roundcube/debian-db-roundcube.php
- chmod 640 /etc/roundcube/config.inc.php
- chown root:www-data /etc/roundcube/debian-db-roundcube.php
- chown root:www-data /etc/roundcube/config.inc.php
+ if [ "$release" -eq 8 ] || [ "$release" -eq 9 ] || [ "$release" -eq 10 ] || [ "$release" -eq 11 ]; then
+ mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php
+ mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php
+ chmod 640 /etc/roundcube/debian-db-roundcube.php
+ chmod 640 /etc/roundcube/config.inc.php
+ chown root:www-data /etc/roundcube/debian-db-roundcube.php
+ chown root:www-data /etc/roundcube/config.inc.php
+ fi
sed -i "s#^\$config\['smtp_user'\].*#\$config\['smtp_user'\] = '%u';#g" /etc/roundcube/defaults.inc.php
sed -i "s#^\$config\['smtp_pass'\].*#\$config\['smtp_pass'\] = '%p';#g" /etc/roundcube/defaults.inc.php
if [ "$release" -eq 8 ]; then
@@ -1698,27 +1582,6 @@ if [ "$fail2ban" = 'yes' ]; then
fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
fi
- if [ ! -e /var/log/auth.log ]; then
- # Debian workaround: auth logging was moved to systemd
- # We took this fix from HestiaCP
- touch /var/log/auth.log
- chmod 640 /var/log/auth.log
- chown root:adm /var/log/auth.log
- fi
- if [ "$proftpd" = 'yes' ]; then
- cat <> /etc/fail2ban/jail.local
-
-[proftpd]
-enabled = true
-filter = proftpd
-action = vesta[name=FTP]
-port = ftp,ftp-data,ftps,ftps-data
-logpath = %(proftpd_log)s
-backend = %(proftpd_backend)s
-maxretry = 5
-EOF
- fi
-
#update-rc.d fail2ban defaults
currentservice='fail2ban'
ensure_startup $currentservice
@@ -1731,7 +1594,7 @@ fi
#----------------------------------------------------------#
echo "=== Configure Admin User"
-if [ "$release" -gt 10 ]; then
+if [ "$release" -eq 11 ]; then
echo "=== Switching to sha512"
sed -i "s/yescrypt/sha512/g" /etc/pam.d/common-password
fi
@@ -1865,19 +1728,6 @@ if [ "$release" -eq 11 ]; then
/usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes'
fi
fi
-if [ "$release" -eq 12 ]; then
- if [ -f "/etc/php/8.2/fpm/pool.d/$servername.conf" ]; then
- echo "== FPM pool.d $servername tweaks"
- sed -i "/^group =/c\group = www-data" /etc/php/8.2/fpm/pool.d/$servername.conf
- sed -i "/max_execution_time/c\php_admin_value[max_execution_time] = 900" /etc/php/8.2/fpm/pool.d/$servername.conf
- sed -i "/request_terminate_timeout/c\request_terminate_timeout = 900s" /etc/php/8.2/fpm/pool.d/$servername.conf
- sed -i "s|80M|800M|g" /etc/php/8.2/fpm/pool.d/$servername.conf
- sed -i "s|256M|512M|g" /etc/php/8.2/fpm/pool.d/$servername.conf
- service php8.2-fpm restart
- ln -s /var/lib/roundcube /var/lib/roundcube/webmail
- /usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes'
- fi
-fi
echo "== Adding cron jobs"
command="sudo $VESTA/bin/v-update-sys-queue disk"
@@ -1937,9 +1787,6 @@ fi
if [ "$release" -eq 11 ]; then
apt-get -y install php7.4-apcu php7.4-mbstring php7.4-bcmath php7.4-curl php7.4-gd php7.4-intl php7.4-mysql php7.4-mysqlnd php7.4-pdo php7.4-soap php7.4-json php7.4-xml php7.4-zip php7.4-memcache php7.4-memcached php7.4-zip php7.4-imagick php7.4-imap
fi
-if [ "$release" -eq 12 ]; then
- apt-get -y install php8.2-apcu php8.2-mbstring php8.2-bcmath php8.2-curl php8.2-gd php8.2-intl php8.2-mysql php8.2-mysqlnd php8.2-pdo php8.2-soap php8.2-xml php8.2-zip php8.2-memcache php8.2-memcached php8.2-zip php8.2-imagick php8.2-imap
-fi
touch /var/log/php-mail.log
chmod a=rw /var/log/php-mail.log
@@ -1988,13 +1835,6 @@ if [ "$release" -eq 11 ]; then
service php7.4-fpm restart
fi
-if [ "$release" -eq 12 ]; then
- echo "=== Patching php8.2"
- patch /etc/php/8.2/fpm/php.ini < /usr/local/vesta/src/deb/for-download/tools/patches/php8.2.patch
- update-alternatives --set php /usr/bin/php8.2
- service php8.2-fpm restart
-fi
-
# echo "=== Patching rcube_vcard.php"
# wget -nv https://c.myvestacp.com/tools/patches/rcube_vcard.patch -O /root/rcube_vcard.patch
# patch /usr/share/roundcube/program/lib/Roundcube/rcube_vcard.php < /root/rcube_vcard.patch
@@ -2072,7 +1912,6 @@ touch /usr/local/vesta/data/upgrades/enable_cookie_httponly
touch /usr/local/vesta/data/upgrades/fix_exim_494_autoreply
touch /usr/local/vesta/data/upgrades/freshclam_start
touch /usr/local/vesta/data/upgrades/barracuda_rbl
-touch /usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed
# Secret URL
secretquery=''
@@ -2087,24 +1926,18 @@ if [ "$port" != "8083" ]; then
$VESTA/bin/v-change-vesta-port $port
fi
+echo "=== Set URL for phpmyadmin"
echo "DB_PMA_URL='https://$servername/phpmyadmin/'" >> $VESTA/conf/vesta.conf
-if [ "$release" -gt 9 ]; then
+if [ "$release" -eq 10 ] || [ "$release" -eq 11 ]; then
echo "=== Set max_length_of_MySQL_username=80"
- echo "MAX_DBUSER_LEN=80" >> $VESTA/conf/vesta.conf
fi
+echo "MAX_DBUSER_LEN=80" >> $VESTA/conf/vesta.conf
echo "ALLOW_BACKUP_ANYTIME='yes'" >> $VESTA/conf/vesta.conf
echo "NOTIFY_ADMIN_FULL_BACKUP='$email'" >> $VESTA/conf/vesta.conf
-echo "=== Adding FileManager license to vesta.conf"
-echo "FILEMANAGER_KEY='FREEFM'" >> $VESTA/conf/vesta.conf
+echo "================================================================"
# Removing old PHP sessions files
-touch /var/spool/cron/crontabs/root
-echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;" >> /var/spool/cron/crontabs/root
-
-if [ -f "/root/.bash_profile" ]; then
- echo "=== Adding v-cd-www alias to root bash profile"
- echo "alias v-cd-www='source /usr/local/vesta/bin/v-change-dir-www'" >> /root/.bash_profile
-fi
+crontab -l | { cat; echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;"; } | crontab -
#----------------------------------------------------------#
# myVesta Access Info #
diff --git a/src/deb/for-download/nginx/nginx-deb12.conf b/src/deb/for-download/nginx/nginx-deb12.conf
deleted file mode 100644
index cf236824..00000000
--- a/src/deb/for-download/nginx/nginx-deb12.conf
+++ /dev/null
@@ -1,128 +0,0 @@
-user admin;
-worker_processes 1;
-error_log /usr/local/vesta/log/nginx-error.log;
-pid /var/run/vesta-nginx.pid;
-
-events {
- worker_connections 128;
- use epoll;
-}
-
-http {
- # Main settings
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- client_header_timeout 1m;
- client_body_timeout 3m;
- client_header_buffer_size 2k;
- client_body_buffer_size 256k;
- client_max_body_size 256m;
- large_client_header_buffers 4 8k;
- send_timeout 30;
- keepalive_timeout 60 60;
- reset_timedout_connection on;
- server_tokens off;
- server_name_in_redirect off;
- server_names_hash_max_size 512;
- server_names_hash_bucket_size 512;
-
-
- # Log format
- log_format main '$remote_addr - $remote_user [$time_local] $request '
- '"$status" $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
- log_format bytes '$body_bytes_sent';
- access_log /usr/local/vesta/log/nginx-access.log main;
-
-
- # SSL PCI Compliance
- ssl_protocols TLSv1.1 TLSv1.2;
- ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
- ssl_session_cache shared:SSL:10m;
- ssl_prefer_server_ciphers on;
-
-
- # Mime settings
- include /usr/local/vesta/nginx/conf/mime.types;
- default_type application/octet-stream;
-
-
- # Compression
- gzip on;
- gzip_comp_level 9;
- gzip_min_length 512;
- gzip_buffers 8 64k;
- gzip_types text/plain text/css text/javascript
- application/x-javascript application/javascript;
- gzip_proxied any;
-
-
- # Proxy settings
- proxy_redirect off;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass_header Set-Cookie;
- proxy_connect_timeout 90;
- proxy_send_timeout 90;
- proxy_read_timeout 90;
- proxy_buffers 32 4k;
- fastcgi_read_timeout 300;
-
- # Error pages
- error_page 403 /error/403.html;
- error_page 404 /error/404.html;
- error_page 502 503 504 /error/50x.html;
-
-
- # Vhost
- server {
- listen 8083 ssl;
- server_name _;
- root /usr/local/vesta/web;
- charset utf-8;
-
- # Fix error "The plain HTTP request was sent to HTTPS port"
- error_page 497 https://$host:$server_port$request_uri;
-
- # ssl on;
- ssl_certificate /usr/local/vesta/ssl/certificate.crt;
- ssl_certificate_key /usr/local/vesta/ssl/certificate.key;
- ssl_session_cache shared:SSL:10m;
- ssl_session_timeout 10m;
-
- error_page 404 /error/404/index.html;
- error_page 403 /error/index.html;
- error_page 500 /error/index.html;
-
- location / {
- expires max;
- index index.php;
- }
-
- location /error/ {
- expires max;
- index index.html;
- }
-
- location /rrd/ {
- expires off;
- internal;
- }
-
- location /backup/ {
- root /;
- internal;
- }
-
- location ~ \.php$ {
- include /usr/local/vesta/nginx/conf/fastcgi_params;
- fastcgi_param SCRIPT_FILENAME /usr/local/vesta/web/$fastcgi_script_name;
- fastcgi_param QUERY_STRING $query_string;
- fastcgi_pass unix:/var/run/vesta-php.sock;
- fastcgi_intercept_errors on;
- break;
- }
- }
-}
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh
deleted file mode 100644
index f5e7c6fd..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php8.3-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 8
-request_terminate_timeout = 360s
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube
-php_admin_value[upload_max_filesize] = 800M
-php_admin_value[max_execution_time] = 300
-php_admin_value[post_max_size] = 800M
-php_admin_value[memory_limit] = 512M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf"
-pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf"
-pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf"
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf"
-pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf"
-pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf"
-pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
-pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf"
-pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf"
-
-if [ -f "$pool_file_56" ]; then
- rm $pool_file_56
- systemctl reset-failed php5.6-fpm
- systemctl restart php5.6-fpm
-fi
-
-if [ -f "$pool_file_70" ]; then
- rm $pool_file_70
- systemctl reset-failed php7.0-fpm
- systemctl restart php7.0-fpm
-fi
-
-if [ -f "$pool_file_71" ]; then
- rm $pool_file_71
- systemctl reset-failed php7.1-fpm
- systemctl restart php7.1-fpm
-fi
-
-if [ -f "$pool_file_72" ]; then
- rm $pool_file_72
- systemctl reset-failed php7.2-fpm
- systemctl restart php7.2-fpm
-fi
-
-if [ -f "$pool_file_73" ]; then
- rm $pool_file_73
- systemctl reset-failed php7.3-fpm
- systemctl restart php7.3-fpm
-fi
-
-if [ -f "$pool_file_74" ]; then
- rm $pool_file_74
- systemctl reset-failed php7.4-fpm
- systemctl restart php7.4-fpm
-fi
-
-if [ -f "$pool_file_80" ]; then
- rm $pool_file_80
- systemctl reset-failed php8.0-fpm
- systemctl restart php8.0-fpm
-fi
-
-if [ -f "$pool_file_81" ]; then
- rm $pool_file_81
- systemctl reset-failed php8.1-fpm
- systemctl restart php8.1-fpm
-fi
-
-if [ -f "$pool_file_82" ]; then
- rm $pool_file_82
- systemctl reset-failed php8.2-fpm
- systemctl restart php8.2-fpm
-fi
-
-write_file=0
-if [ ! -f "$pool_file_83" ]; then
- write_file=1
-else
- user_count=$(grep -c "/home/$1/" $pool_file_83)
- if [ $user_count -eq 0 ]; then
- write_file=1
- fi
-fi
-if [ $write_file -eq 1 ]; then
- echo "$pool_conf" > $pool_file_83
- systemctl reset-failed php8.3-fpm
- systemctl restart php8.3-fpm
-fi
-if [ -f "/etc/php/8.3/fpm/pool.d/www.conf" ]; then
- rm /etc/php/8.3/fpm/pool.d/www.conf
-fi
-
-exit 0
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl
deleted file mode 100644
index cceed0ee..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %sdocroot%/public
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- SSLRequireSSL
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
- SSLEngine on
- SSLVerifyClient none
- SSLCertificateFile %ssl_crt%
- SSLCertificateKeyFile %ssl_key%
- %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-
-
- SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl
deleted file mode 100644
index ac952817..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %docroot%/public
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
-
-
- SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh
deleted file mode 100644
index f5e7c6fd..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php8.3-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 8
-request_terminate_timeout = 360s
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube
-php_admin_value[upload_max_filesize] = 800M
-php_admin_value[max_execution_time] = 300
-php_admin_value[post_max_size] = 800M
-php_admin_value[memory_limit] = 512M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf"
-pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf"
-pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf"
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf"
-pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf"
-pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf"
-pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
-pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf"
-pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf"
-
-if [ -f "$pool_file_56" ]; then
- rm $pool_file_56
- systemctl reset-failed php5.6-fpm
- systemctl restart php5.6-fpm
-fi
-
-if [ -f "$pool_file_70" ]; then
- rm $pool_file_70
- systemctl reset-failed php7.0-fpm
- systemctl restart php7.0-fpm
-fi
-
-if [ -f "$pool_file_71" ]; then
- rm $pool_file_71
- systemctl reset-failed php7.1-fpm
- systemctl restart php7.1-fpm
-fi
-
-if [ -f "$pool_file_72" ]; then
- rm $pool_file_72
- systemctl reset-failed php7.2-fpm
- systemctl restart php7.2-fpm
-fi
-
-if [ -f "$pool_file_73" ]; then
- rm $pool_file_73
- systemctl reset-failed php7.3-fpm
- systemctl restart php7.3-fpm
-fi
-
-if [ -f "$pool_file_74" ]; then
- rm $pool_file_74
- systemctl reset-failed php7.4-fpm
- systemctl restart php7.4-fpm
-fi
-
-if [ -f "$pool_file_80" ]; then
- rm $pool_file_80
- systemctl reset-failed php8.0-fpm
- systemctl restart php8.0-fpm
-fi
-
-if [ -f "$pool_file_81" ]; then
- rm $pool_file_81
- systemctl reset-failed php8.1-fpm
- systemctl restart php8.1-fpm
-fi
-
-if [ -f "$pool_file_82" ]; then
- rm $pool_file_82
- systemctl reset-failed php8.2-fpm
- systemctl restart php8.2-fpm
-fi
-
-write_file=0
-if [ ! -f "$pool_file_83" ]; then
- write_file=1
-else
- user_count=$(grep -c "/home/$1/" $pool_file_83)
- if [ $user_count -eq 0 ]; then
- write_file=1
- fi
-fi
-if [ $write_file -eq 1 ]; then
- echo "$pool_conf" > $pool_file_83
- systemctl reset-failed php8.3-fpm
- systemctl restart php8.3-fpm
-fi
-if [ -f "/etc/php/8.3/fpm/pool.d/www.conf" ]; then
- rm /etc/php/8.3/fpm/pool.d/www.conf
-fi
-
-exit 0
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl
deleted file mode 100644
index f043bfa8..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %sdocroot%
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- SSLRequireSSL
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
- SSLEngine on
- SSLVerifyClient none
- SSLCertificateFile %ssl_crt%
- SSLCertificateKeyFile %ssl_key%
- %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-
-
- SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl
deleted file mode 100644
index 9b5bf916..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %docroot%
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
-
-
- SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh
deleted file mode 100644
index cbea2de9..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php8.4-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 8
-request_terminate_timeout = 360s
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube
-php_admin_value[upload_max_filesize] = 800M
-php_admin_value[max_execution_time] = 300
-php_admin_value[post_max_size] = 800M
-php_admin_value[memory_limit] = 512M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf"
-pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf"
-pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf"
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf"
-pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf"
-pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf"
-pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
-pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf"
-pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf"
-pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf"
-
-if [ -f "$pool_file_56" ]; then
- rm $pool_file_56
- systemctl reset-failed php5.6-fpm
- systemctl restart php5.6-fpm
-fi
-
-if [ -f "$pool_file_70" ]; then
- rm $pool_file_70
- systemctl reset-failed php7.0-fpm
- systemctl restart php7.0-fpm
-fi
-
-if [ -f "$pool_file_71" ]; then
- rm $pool_file_71
- systemctl reset-failed php7.1-fpm
- systemctl restart php7.1-fpm
-fi
-
-if [ -f "$pool_file_72" ]; then
- rm $pool_file_72
- systemctl reset-failed php7.2-fpm
- systemctl restart php7.2-fpm
-fi
-
-if [ -f "$pool_file_73" ]; then
- rm $pool_file_73
- systemctl reset-failed php7.3-fpm
- systemctl restart php7.3-fpm
-fi
-
-if [ -f "$pool_file_74" ]; then
- rm $pool_file_74
- systemctl reset-failed php7.4-fpm
- systemctl restart php7.4-fpm
-fi
-
-if [ -f "$pool_file_80" ]; then
- rm $pool_file_80
- systemctl reset-failed php8.0-fpm
- systemctl restart php8.0-fpm
-fi
-
-if [ -f "$pool_file_81" ]; then
- rm $pool_file_81
- systemctl reset-failed php8.1-fpm
- systemctl restart php8.1-fpm
-fi
-
-if [ -f "$pool_file_82" ]; then
- rm $pool_file_82
- systemctl reset-failed php8.2-fpm
- systemctl restart php8.2-fpm
-fi
-
-if [ -f "$pool_file_83" ]; then
- rm $pool_file_83
- systemctl reset-failed php8.3-fpm
- systemctl restart php8.3-fpm
-fi
-
-write_file=0
-if [ ! -f "$pool_file_84" ]; then
- write_file=1
-else
- user_count=$(grep -c "/home/$1/" $pool_file_84)
- if [ $user_count -eq 0 ]; then
- write_file=1
- fi
-fi
-if [ $write_file -eq 1 ]; then
- echo "$pool_conf" > $pool_file_84
- systemctl reset-failed php8.4-fpm
- systemctl restart php8.4-fpm
-fi
-if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then
- rm /etc/php/8.4/fpm/pool.d/www.conf
-fi
-
-exit 0
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl
deleted file mode 100644
index 91e05b17..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %sdocroot%/public
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- SSLRequireSSL
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
- SSLEngine on
- SSLVerifyClient none
- SSLCertificateFile %ssl_crt%
- SSLCertificateKeyFile %ssl_key%
- %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-
-
- SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl
deleted file mode 100644
index 94acbf15..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %docroot%/public
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
-
-
- SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh
deleted file mode 100644
index cbea2de9..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-# Adding php pool conf
-user="$1"
-domain="$2"
-ip="$3"
-home_dir="$4"
-docroot="$5"
-
-pool_conf="[$2]
-
-listen = /run/php/php8.4-fpm-$2.sock
-listen.owner = $1
-listen.group = $1
-listen.mode = 0666
-
-user = $1
-group = $1
-
-pm = ondemand
-pm.max_children = 8
-request_terminate_timeout = 360s
-pm.max_requests = 4000
-pm.process_idle_timeout = 10s
-pm.status_path = /status
-
-php_admin_value[upload_tmp_dir] = /home/$1/tmp
-php_admin_value[session.save_path] = /home/$1/tmp
-php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube
-php_admin_value[upload_max_filesize] = 800M
-php_admin_value[max_execution_time] = 300
-php_admin_value[post_max_size] = 800M
-php_admin_value[memory_limit] = 512M
-php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
-php_admin_flag[mysql.allow_persistent] = off
-php_admin_flag[safe_mode] = off
-
-env[PATH] = /usr/local/bin:/usr/bin:/bin
-env[TMP] = /home/$1/tmp
-env[TMPDIR] = /home/$1/tmp
-env[TEMP] = /home/$1/tmp
-"
-
-pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf"
-pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf"
-pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf"
-pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
-pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf"
-pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf"
-pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf"
-pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
-pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf"
-pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf"
-pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf"
-
-if [ -f "$pool_file_56" ]; then
- rm $pool_file_56
- systemctl reset-failed php5.6-fpm
- systemctl restart php5.6-fpm
-fi
-
-if [ -f "$pool_file_70" ]; then
- rm $pool_file_70
- systemctl reset-failed php7.0-fpm
- systemctl restart php7.0-fpm
-fi
-
-if [ -f "$pool_file_71" ]; then
- rm $pool_file_71
- systemctl reset-failed php7.1-fpm
- systemctl restart php7.1-fpm
-fi
-
-if [ -f "$pool_file_72" ]; then
- rm $pool_file_72
- systemctl reset-failed php7.2-fpm
- systemctl restart php7.2-fpm
-fi
-
-if [ -f "$pool_file_73" ]; then
- rm $pool_file_73
- systemctl reset-failed php7.3-fpm
- systemctl restart php7.3-fpm
-fi
-
-if [ -f "$pool_file_74" ]; then
- rm $pool_file_74
- systemctl reset-failed php7.4-fpm
- systemctl restart php7.4-fpm
-fi
-
-if [ -f "$pool_file_80" ]; then
- rm $pool_file_80
- systemctl reset-failed php8.0-fpm
- systemctl restart php8.0-fpm
-fi
-
-if [ -f "$pool_file_81" ]; then
- rm $pool_file_81
- systemctl reset-failed php8.1-fpm
- systemctl restart php8.1-fpm
-fi
-
-if [ -f "$pool_file_82" ]; then
- rm $pool_file_82
- systemctl reset-failed php8.2-fpm
- systemctl restart php8.2-fpm
-fi
-
-if [ -f "$pool_file_83" ]; then
- rm $pool_file_83
- systemctl reset-failed php8.3-fpm
- systemctl restart php8.3-fpm
-fi
-
-write_file=0
-if [ ! -f "$pool_file_84" ]; then
- write_file=1
-else
- user_count=$(grep -c "/home/$1/" $pool_file_84)
- if [ $user_count -eq 0 ]; then
- write_file=1
- fi
-fi
-if [ $write_file -eq 1 ]; then
- echo "$pool_conf" > $pool_file_84
- systemctl reset-failed php8.4-fpm
- systemctl restart php8.4-fpm
-fi
-if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then
- rm /etc/php/8.4/fpm/pool.d/www.conf
-fi
-
-exit 0
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl
deleted file mode 100644
index 848abf7c..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %sdocroot%
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- SSLRequireSSL
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
- SSLEngine on
- SSLVerifyClient none
- SSLCertificateFile %ssl_crt%
- SSLCertificateKeyFile %ssl_key%
- %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
-
-
- SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl
deleted file mode 100644
index 065c1f89..00000000
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- ServerName %domain_idn%
- %alias_string%
- ServerAdmin %email%
- DocumentRoot %docroot%
- ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
- Alias /vstats/ %home%/%user%/web/%domain%/stats/
- Alias /error/ %home%/%user%/web/%domain%/document_errors/
- #SuexecUserGroup %user% %group%
- CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
- CustomLog /var/log/%web_system%/domains/%domain%.log combined
- ErrorLog /var/log/%web_system%/domains/%domain%.error.log
-
- AllowOverride All
-
-
- AllowOverride All
- Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch
-
-
-
- SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/"
-
- SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
-
- IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
-
-
-
diff --git a/src/deb/for-download/tools/default-pool.d/8.3/www.conf b/src/deb/for-download/tools/default-pool.d/8.3/www.conf
deleted file mode 100644
index f18939a3..00000000
--- a/src/deb/for-download/tools/default-pool.d/8.3/www.conf
+++ /dev/null
@@ -1,490 +0,0 @@
-; Start a new pool named 'www'.
-; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('www' here)
-[www]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of the child processes. This can be used only if the master
-; process running user is root. It is set after the child process is created.
-; The user and group can be specified either by their name or by their numeric
-; IDs.
-; Note: If the user is root, the executable needs to be started with
-; --allow-to-run-as-root option to work.
-; Default Values: The user is set to master process running user by default.
-; If the group is not set, the user's group is used.
-user = www-data
-group = www-data
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
-; a specific port;
-; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-; a specific port;
-; 'port' - to listen on a TCP socket to all addresses
-; (IPv6 and IPv4-mapped) on a specific port;
-; '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /run/php/php8.3-fpm.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD)
-;listen.backlog = 511
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions. The owner
-; and group can be specified either by name or by their numeric IDs.
-; Default Values: Owner is set to the master process running user. If the group
-; is not set, the owner's group is used. Mode is set to 0660.
-listen.owner = www-data
-listen.group = www-data
-;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
-;listen.acl_users =
-;listen.acl_groups =
-
-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Set the associated the route table (FIB). FreeBSD only
-; Default Value: -1
-;listen.setfib = 1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-; - The pool processes will inherit the master process priority
-; unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
-; PROC_TRACE_CTL procctl for FreeBSD) even if the process user
-; or group is different than the master process user. It allows to create process
-; core dump and ptrace the process for the pool user.
-; Default Value: no
-; process.dumpable = yes
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-; static - a fixed number (pm.max_children) of child processes;
-; dynamic - the number of child processes are set dynamically based on the
-; following directives. With this process management, there will be
-; always at least 1 children.
-; pm.max_children - the maximum number of children that can
-; be alive at the same time.
-; pm.start_servers - the number of children created on startup.
-; pm.min_spare_servers - the minimum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is less than this
-; number then some children will be created.
-; pm.max_spare_servers - the maximum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is greater than this
-; number then some children will be killed.
-; pm.max_spawn_rate - the maximum number of rate to spawn child
-; processes at once.
-; ondemand - no children are created at startup. Children will be forked when
-; new requests will connect. The following parameter are used:
-; pm.max_children - the maximum number of children that
-; can be alive at the same time.
-; pm.process_idle_timeout - The number of seconds after which
-; an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: (min_spare_servers + max_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of rate to spawn child processes at once.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-; Default Value: 32
-;pm.max_spawn_rate = 32
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following information:
-; pool - the name of the pool;
-; process manager - static, dynamic or ondemand;
-; start time - the date and time FPM has started;
-; start since - number of seconds since FPM has started;
-; accepted conn - the number of request accepted by the pool;
-; listen queue - the number of request in the queue of pending
-; connections (see backlog in listen(2));
-; max listen queue - the maximum number of requests in the queue
-; of pending connections since FPM has started;
-; listen queue len - the size of the socket queue of pending connections;
-; idle processes - the number of idle processes;
-; active processes - the number of active processes;
-; total processes - the number of idle + active processes;
-; max active processes - the maximum number of active processes since FPM
-; has started;
-; max children reached - number of times, the process limit has been reached,
-; when pm tries to start more children (works only for
-; pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-; pool: www
-; process manager: static
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 62636
-; accepted conn: 190460
-; listen queue: 0
-; max listen queue: 1
-; listen queue len: 42
-; idle processes: 4
-; active processes: 11
-; total processes: 15
-; max active processes: 12
-; max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-; http://www.foo.bar/status
-; http://www.foo.bar/status?json
-; http://www.foo.bar/status?html
-; http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-; http://www.foo.bar/status?full
-; http://www.foo.bar/status?json&full
-; http://www.foo.bar/status?html&full
-; http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-; pid - the PID of the process;
-; state - the state of the process (Idle, Running, ...);
-; start time - the date and time the process has started;
-; start since - the number of seconds since the process has started;
-; requests - the number of requests the process has served;
-; request duration - the duration in µs of the requests;
-; request method - the request method (GET, POST, ...);
-; request URI - the request URI with the query string;
-; content length - the content length of the request (only with POST);
-; user - the user (PHP_AUTH_USER) (or '-' if not set);
-; script - the main script called (or '-' if not set);
-; last request cpu - the %cpu the last request consumed
-; it's always 0 if the process is not in Idle state
-; because CPU calculation is done when the request
-; processing has terminated;
-; last request memory - the max amount of memory the last request consumed
-; it's always 0 if the process is not in Idle state
-; because memory calculation is done when the request
-; processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-; ************************
-; pid: 31330
-; state: Running
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 63087
-; requests: 12808
-; request duration: 1250261
-; request method: GET
-; request URI: /test_mem.php?N=10000
-; content length: 0
-; user: -
-; script: /home/fat/web/docs/php/test_mem.php
-; last request cpu: 0.00
-; last request memory: 0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: /usr/share/php/8.3/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-; 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
-
-; The address on which to accept FastCGI status request. This creates a new
-; invisible pool that can handle requests independently. This is useful
-; if the main pool is busy with long running requests because it is still possible
-; to get the status before finishing the long running requests.
-;
-; Valid syntaxes are:
-; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
-; a specific port;
-; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-; a specific port;
-; 'port' - to listen on a TCP socket to all addresses
-; (IPv6 and IPv4-mapped) on a specific port;
-; '/path/to/unix/socket' - to listen on a unix socket.
-; Default Value: value of the listen option
-;pm.status_listen = 127.0.0.1:9001
-
-; 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
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-; 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
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-; %%: the '%' character
-; %C: %CPU used by the request
-; it can accept the following format:
-; - %{user}C for user CPU only
-; - %{system}C for system CPU only
-; - %{total}C for user + system CPU (default)
-; %d: time taken to serve the request
-; it can accept the following format:
-; - %{seconds}d (default)
-; - %{milliseconds}d
-; - %{milli}d
-; - %{microseconds}d
-; - %{micro}d
-; %e: an environment variable (same as $_ENV or $_SERVER)
-; it must be associated with embraces to specify the name of the env
-; variable. Some examples:
-; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-; %f: script filename
-; %l: content-length of the request (for POST request only)
-; %m: request method
-; %M: peak of memory allocated by PHP
-; it can accept the following format:
-; - %{bytes}M (default)
-; - %{kilobytes}M
-; - %{kilo}M
-; - %{megabytes}M
-; - %{mega}M
-; %n: pool name
-; %o: output header
-; it must be associated with embraces to specify the name of the header:
-; - %{Content-Type}o
-; - %{X-Powered-By}o
-; - %{Transfert-Encoding}o
-; - ....
-; %p: PID of the child that serviced the request
-; %P: PID of the parent of the child that serviced the request
-; %q: the query string
-; %Q: the '?' character if query string exists
-; %r: the request URI (without the query string, see %q and %Q)
-; %R: remote IP address
-; %s: status (response code)
-; %t: server time the request was received
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsulated in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %T: time the log has been written (the request has finished)
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsulated in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
-
-; A list of request_uri values which should be filtered from the access log.
-;
-; As a security precuation, this setting will be ignored if:
-; - the request method is not GET or HEAD; or
-; - there is a request body; or
-; - there are query parameters; or
-; - the response code is outwith the successful range of 200 to 299
-;
-; Note: The paths are matched against the output of the access.format tag "%r".
-; On common configurations, this may look more like SCRIPT_NAME than the
-; expected pre-rewrite URI.
-;
-; Default Value: not set
-;access.suppress_path[] = /ping
-;access.suppress_path[] = /health_check.php
-
-; 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
-
-; 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'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; Depth of slow log stack trace.
-; Default Value: 20
-;request_slowlog_trace_depth = 20
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_terminate_timeout = 0
-
-; The timeout set by 'request_terminate_timeout' ini option is not engaged after
-; application calls 'fastcgi_finish_request' or when application has finished and
-; shutdown functions are being called (registered via register_shutdown_function).
-; This option will enable timeout limit to be applied unconditionally
-; even in such cases.
-; Default Value: no
-;request_terminate_timeout_track_finished = no
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-; possible. However, all PHP paths will be relative to the chroot
-; (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-;chdir = /var/www
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environment, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Decorate worker output with prefix and suffix containing information about
-; the child that writes to the log and if stdout or stderr is used as well as
-; log level and time. This options is used only if catch_workers_output is yes.
-; Settings to "no" will output data as written to the stdout or stderr.
-; Default value: yes
-;decorate_workers_output = no
-
-; Clear environment in FPM workers
-; Prevents arbitrary environment variables from reaching FPM worker processes
-; by clearing the environment in workers before env vars specified in this
-; pool configuration are added.
-; Setting to "no" will make all environment variables available to PHP code
-; via getenv(), $_ENV and $_SERVER.
-; Default Value: yes
-;clear_env = no
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5 .php7
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-; php_value/php_flag - you can set classic ini defines which can
-; be overwritten from PHP call 'ini_set'.
-; php_admin_value/php_admin_flag - these directives won't be overwritten by
-; PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-; specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
diff --git a/src/deb/for-download/tools/imapsync/create-mail-sync.sh b/src/deb/for-download/tools/imapsync/create-mail-sync.sh
index 94762505..e325754e 100644
--- a/src/deb/for-download/tools/imapsync/create-mail-sync.sh
+++ b/src/deb/for-download/tools/imapsync/create-mail-sync.sh
@@ -35,35 +35,18 @@ fi
TESTOPT=""
if [[ $TEST -eq 1 ]]; then
- TESTOPT="--justlogin"
+ TESTOPT="--justlogin"
fi
if [ ! -d "accounts" ]; then
mkdir accounts
fi
if [ -f "accounts/$EMAIL" ]; then
- echo "********* EMAIL $EMAIL ALREADY EXISTS !!! ************"
+ echo "********* $EMAIL ALREADY EXISTS !!! ************"
exit 1;
exit
fi
-euser=$(echo $EMAIL | cut -d '@' -f 1)
-domain=$(echo $EMAIL | cut -d '@' -f 2)
-user=$(/usr/local/vesta/bin/v-search-domain-owner $domain)
-if [ "$user" != "" ]; then
- echo "=== Email '$EMAIL' has username email part '$euser', domain is '$domain', and belongs to myVesta account: $user"
- if [ ! -d "/home/$user/mail/$domain" ]; then
- echo "======= Creating '$domail' in MAIL section"
- /usr/local/vesta/bin/v-add-mail-domain "$user" "$domain"
- fi
- if [ ! -d "/home/$user/mail/$domain/$euser" ]; then
- echo "======= Creating '$euser' mail account for domain '$domain'"
- /usr/local/vesta/bin/v-add-mail-account "$user" "$domain" "$euser" "$PASS2"
- echo ""
- fi
-fi
-
-
echo "Writing to: accounts/$EMAIL"
echo "#!/bin/bash
@@ -84,20 +67,21 @@ exit;
chmod a=rwx accounts/$EMAIL
if [[ $TEST -eq 0 ]]; then
- exit 0;
+ exit 0;
fi
accounts/$EMAIL
RET=$?
if [ $RET -eq 0 ]; then
- # echo "./create-mail-sync.sh $EMAIL $PASS $PASS2 $TEST"
- sed -i "s/--justlogin//g" accounts/$EMAIL
- echo "--- OK! ---"
- echo "./create-mail-sync.sh '$SRCHOST' '$EMAIL' '$PASS' '$PASS2' $TEST" >> accounts.log
+ # echo "./create-mail-sync.sh $EMAIL $PASS $PASS2 $TEST"
+ sed -i "s/--justlogin//g" accounts/$EMAIL
+ echo "--- OK! ---"
+ echo "./create-mail-sync.sh '$SRCHOST' '$EMAIL' '$PASS' '$PASS2' $TEST" >> accounts.log
else
- echo "********* $EMAIL ERROR !!! [ret: $RET ] ************"
- rm accounts/$EMAIL
- read -p "=== Press ENTER to continue ===" entered
+ echo "********* $EMAIL ERROR !!! [ret: $RET ] ************"
+ echo "********* $EMAIL ERROR !!! [ret: $RET ] ************"
+ echo "********* $EMAIL ERROR !!! [ret: $RET ] ************"
+ rm accounts/$EMAIL
fi
exit $RET;
diff --git a/src/deb/for-download/tools/imapsync/import-from-file.sh b/src/deb/for-download/tools/imapsync/import-from-file.sh
deleted file mode 100644
index ac0c42f4..00000000
--- a/src/deb/for-download/tools/imapsync/import-from-file.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-#
-# This script reads email and password=s in following format:
-# email1 pass
-# email2 pass
-# email3 pass
-
-# The first parameter is the text file from which we read emails and passwords
-# The second parameter is SMTP Hostname
-# The third parameter is domain if lines contains only username part
-
-
-host=''
-if [ $# -gt 1 ]; then
- host=$2
-else
- echo "Usage: ./import-from-file.sh 'FILE' 'SMTPHOST' ['DOMAIN']"
- exit 1;
-fi
-
-domain=''
-if [ $# -gt 2 ]; then
- domain=$3
-fi
-
-end_of_file=0
-while [[ $end_of_file == 0 ]]; do
-
- read -r line
- end_of_file=$?
-
- if [ "$line" == "" ]; then
- if [[ $end_of_file == 1 ]]; then
- echo "===EOF==="
- break;
- fi
- continue
- fi
-
- email=$(echo "$line" | awk '{print $1}')
- pass=$(echo "$line" | awk '{print $2}')
-
- if [[ $email != *"@"* ]]; then
- email="$email@$domain"
- fi
-
- echo "Extracted: '$email' = '$pass'"
-
- ./create-mail-sync.sh "$host" "$email" "$pass"
-
- if [[ $end_of_file == 1 ]]; then
- echo "===EOF==="
- break;
- fi
-
-done < $1
diff --git a/src/deb/for-download/tools/install-new-roundcube.sh b/src/deb/for-download/tools/install-new-roundcube.sh
index 0f6a343a..6311563e 100644
--- a/src/deb/for-download/tools/install-new-roundcube.sh
+++ b/src/deb/for-download/tools/install-new-roundcube.sh
@@ -3,7 +3,7 @@
USER='webmail'
DOMAIN='' # enter domain or subdomain
-VERSION='1.6.6'
+VERSION='1.6.0'
DOWNLOAD="https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz"
LOGINMESSAGE1='Click here for NEW Webmail'
@@ -140,27 +140,6 @@ if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl" ]; then
apt install -y php7.4-imap
echo "================================"
fi
-if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.tpl" ]; then
- echo "================================"
- echo "== Installing php8.0-imap module"
- apt update
- apt install -y php8.0-imap
- echo "================================"
-fi
-if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.tpl" ]; then
- echo "================================"
- echo "== Installing php8.1-imap module"
- apt update
- apt install -y php8.1-imap
- echo "================================"
-fi
-if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl" ]; then
- echo "================================"
- echo "== Installing php8.2-imap module"
- apt update
- apt install -y php8.2-imap
- echo "================================"
-fi
echo "-------------------------------------"
echo "Go to:"
@@ -168,7 +147,6 @@ echo "https://${DOMAIN}/installer/"
echo "... and finish the Roundcube installation."
echo ""
echo "You will be asked for:"
-echo "Database host: localhost"
echo "Database user: $DATABASE_NAME"
echo "Database name: $DATABASE_NAME"
echo "Database pass: $DATABASE_PASSWORD"
@@ -197,19 +175,17 @@ if [ -d "/home/$USER/web/$DOMAIN/public_html/plugins/password" ]; then
cp /usr/share/roundcube/plugins/password/drivers/vesta.php /home/$USER/web/$DOMAIN/public_html/plugins/password/drivers/vesta.php
fi
-# wget -nv https://c.myvestacp.com/tools/roundcube-filters.tgz -O /root/roundcube-filters.tgz
-# tar --directory /home/$USER/web/$DOMAIN/public_html/plugins -xzf /root/roundcube-filters.tgz
-# sed -i "s/\$config\['plugins'\] = \[/\$config['plugins'] = ['filters', /g" /home/$USER/web/$DOMAIN/public_html/config/config.inc.php
+wget -nv https://c.myvestacp.com/tools/roundcube-filters.tgz -O /root/roundcube-filters.tgz
+tar --directory /home/$USER/web/$DOMAIN/public_html/plugins -xzf /root/roundcube-filters.tgz
+sed -i "s/\$config\['plugins'\] = \[/\$config['plugins'] = ['filters', /g" /home/$USER/web/$DOMAIN/public_html/config/config.inc.php
echo "\$config['session_lifetime'] = 1080;" >> /home/$USER/web/$DOMAIN/public_html/config/config.inc.php
fix_ownership
-if [ -f "/usr/share/roundcube/skins/larry/templates/login.html" ]; then
- check_grep=$(grep -c 'color: white; font-size: 12pt' /usr/share/roundcube/skins/larry/templates/login.html)
- if [ "$check_grep" -eq 0 ]; then
- sed -i "s||