Skip to content

Commit 12ff2ee

Browse files
ScIT-RaphaelScIT-Raphael
authored
Remove Webalizer from system and set awstats as default
2 parents ebc98a4 + cfc39dc commit 12ff2ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+19
-57
lines changed

‎bin/v-add-web-domain-stats‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
# info: add log analyzer to generate domain statitics
33
# options: USER DOMAIN TYPE
44
#
5-
# The call is used for enabling log analyzer system to a domain. At this time
6-
# two types of these system is supported - awstats and webalizer. For viewing
5+
# The call is used for enabling log analyzer system to a domain. For viewing
76
# the domain statistics use http://domain.tld/vstats/ link. Access this page
87
# is not protected by default. If you want to secure it with passwords you
98
# should use v-add-web-domain_stat_auth script.
@@ -74,8 +73,6 @@ if [ "$type" == 'awstats' ]; then
7473
rm -f /etc/awstats/$type.$domain_idn.conf
7574
ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
7675
/etc/awstats/$type.$domain_idn.conf
77-
else
78-
mkdir -p /var/lib/webalizer
7976
fi
8077

8178

‎bin/v-change-web-domain-stats‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ if [ "$type" == 'awstats' ]; then
8686
rm -f /etc/awstats/$type.$domain_idn.conf
8787
ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
8888
/etc/awstats/$type.$domain_idn.conf
89-
else
90-
mkdir -p /var/lib/webalizer
9189
fi
9290

9391

‎bin/v-update-web-domain-stat‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ if [ ! -e "$dir" ]; then
5757
fi
5858

5959
# Defining functions
60-
build_webalizer() {
61-
/usr/bin/webalizer -c $config
62-
}
63-
6460
build_awstats() {
6561
if [ -d "/etc/sysconfig" ]; then
6662
awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl"
@@ -135,7 +131,6 @@ build_awstats() {
135131

136132
# Switching on statistics type
137133
case $STATS in
138-
webalizer) build_webalizer ;;
139134
awstats) build_awstats ;;
140135
esac
141136

‎install/hst-install-debian.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if [ "$release" -eq 9 ]; then
3030
software="nginx apache2 apache2-utils apache2-suexec-custom
3131
libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
3232
php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
33-
awstats webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
33+
awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
3434
clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
3535
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
3636
mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
@@ -42,7 +42,7 @@ else
4242
software="nginx apache2 apache2-utils apache2.2-common
4343
apache2-suexec-custom libapache2-mod-ruid2
4444
libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
45-
php5-mysql php5-curl php5-pgsql awstats webalizer vsftpd net-tools
45+
php5-mysql php5-curl php5-pgsql awstats vsftpd net-tools
4646
proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
4747
spamassassin dovecot-imapd dovecot-pop3d roundcube-core
4848
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
@@ -927,7 +927,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then
927927
echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
928928
echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
929929
echo "WEB_SSL='mod_ssl'" >> $HESTIA/conf/hestia.conf
930-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
930+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
931931
fi
932932
if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then
933933
echo "WEB_SYSTEM='apache2'" >> $HESTIA/conf/hestia.conf
@@ -938,7 +938,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then
938938
echo "PROXY_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
939939
echo "PROXY_PORT='80'" >> $HESTIA/conf/hestia.conf
940940
echo "PROXY_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
941-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
941+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
942942
fi
943943
if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
944944
echo "WEB_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
@@ -954,7 +954,7 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
954954
echo "WEB_BACKEND='php5-fpm'" >> $HESTIA/conf/hestia.conf
955955
fi
956956
fi
957-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
957+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
958958
fi
959959

960960
# FTP stack

‎install/hst-install-ubuntu.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
3636
ntpdate php php-cgi php-common php-curl phpmyadmin php-mysql php-imap php-ldap
3737
php-apcu phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
3838
roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
39-
sudo hestia hestia-nginx hestia-php vim-common vsftpd webalizer whois zip"
39+
sudo hestia hestia-nginx hestia-php vim-common vsftpd whois zip"
4040

4141
# Defining help function
4242
help() {
@@ -906,7 +906,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then
906906
echo "WEB_PORT='80'" >> $HESTIA/conf/hestia.conf
907907
echo "WEB_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
908908
echo "WEB_SSL='mod_ssl'" >> $HESTIA/conf/hestia.conf
909-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
909+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
910910
fi
911911
if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then
912912
echo "WEB_SYSTEM='apache2'" >> $HESTIA/conf/hestia.conf
@@ -917,7 +917,7 @@ if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then
917917
echo "PROXY_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
918918
echo "PROXY_PORT='80'" >> $HESTIA/conf/hestia.conf
919919
echo "PROXY_SSL_PORT='443'" >> $HESTIA/conf/hestia.conf
920-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
920+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
921921
fi
922922
if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
923923
echo "WEB_SYSTEM='nginx'" >> $HESTIA/conf/hestia.conf
@@ -927,7 +927,7 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
927927
if [ "$phpfpm" = 'yes' ]; then
928928
echo "WEB_BACKEND='php-fpm'" >> $HESTIA/conf/hestia.conf
929929
fi
930-
echo "STATS_SYSTEM='webalizer,awstats'" >> $HESTIA/conf/hestia.conf
930+
echo "STATS_SYSTEM='awstats'" >> $HESTIA/conf/hestia.conf
931931
fi
932932

933933
# FTP stack

‎install/upgrade/0.9.8-28.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,12 @@ for user in `ls /usr/local/hestia/data/users/`; do
206206
v-rebuild-mail-domains $user
207207
done
208208

209+
210+
# Remove Webalizer and replace it with awstats as default
211+
echo "(*) Setting awstats as default web statistics backend..."
212+
apt purge webalizer -y > /dev/null 2>&1
213+
sed -i "s/STATS_SYSTEM='webalizer,awstats'/STATS_SYSTEM='awstats'/g" $HESTIA/conf/hestia.conf
214+
209215
# Move clamav to proper location - https://goo.gl/zNuM11
210216
if [ ! -d /usr/local/hestia/web/edit/server/clamav-daemon ]; then
211217
mv /usr/local/hestia/web/edit/server/clamd /usr/local/web/edit/server/clamav-daemon

‎test/test_actions.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ $cmd > $tmpfile 2>> $tmpfile
206206
echo_result "WEB: Disabling cgi support" "$?" "$tmpfile" "$cmd"
207207

208208
# Add web domain stats
209-
cmd="v_add_web_domain_stats $user $domain webalizer"
209+
cmd="v_add_web_domain_stats $user $domain awstats"
210210
$cmd > $tmpfile 2>> $tmpfile
211-
echo_result "WEB: Enabling webalizer" "$?" "$tmpfile" "$cmd"
211+
echo_result "WEB: Enabling awstats" "$?" "$tmpfile" "$cmd"
212212

213213
# Add web domain stats
214214
cmd="v_add_web_domain_stats_user $user $domain test m3g4p4ssw0rd"
215215
$cmd > $tmpfile 2>> $tmpfile
216-
echo_result "WEB: Adding webalizer uzer" "$?" "$tmpfile" "$cmd"
216+
echo_result "WEB: Adding awstats uzer" "$?" "$tmpfile" "$cmd"
217217

218218
# Add web domain nginx
219219
cmd="v_add_web_domain_nginx $user $domain"

‎web/inc/i18n/ar.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@
733733
'every' => 'كل',
734734
'Generate' => 'توليد',
735735

736-
'webalizer' => 'محلل الويب webalizer',
737736
'awstats' => 'احصائيات الويب awstats',
738737

739738
'Hestia SSL' => 'فيستا SSL',

‎web/inc/i18n/az.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@
705705
'every two minutes' => 'hər iki dəqiqdə bir',
706706
'every' => 'hər',
707707
'Generate' => 'Yaratmaq',
708-
'webalizer' => 'webalizer',
709708
'awstats' => 'awstats',
710709
'Vesta SSL' => 'Vesta SSL',
711710
'SUBJECT' => 'MÖVZU',

‎web/inc/i18n/bg.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@
727727
'every' => 'всеки',
728728
'Generate' => 'Генерирай',
729729

730-
'webalizer' => 'webalizer',
731730
'awstats' => 'awstats',
732731

733732
'Hestia SSL' => 'Hestia SSL',

0 commit comments

Comments
 (0)