diff --git a/.gitattributes b/.gitattributes index ec952516..4fdecee0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -453,6 +453,7 @@ po/fr/LC_MESSAGES/alternc-admintools.po -text /quota_init -text src/Makefile -text src/alternc-check -text +src/alternc-dboptimize -text src/alternc-passwd -text src/alternc_reload -text src/du.pl -text diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php index 89ee51bb..6cfc1677 100644 --- a/bureau/admin/menu_adm.php +++ b/bureau/admin/menu_adm.php @@ -42,7 +42,7 @@ if ($mem->checkRight()) { ?>
  • -
  • +
  • diff --git a/bureau/admin/sql_admin.php b/bureau/admin/sql_admin.php index b8eb24bf..4e6c2cd1 100644 --- a/bureau/admin/sql_admin.php +++ b/bureau/admin/sql_admin.php @@ -37,7 +37,7 @@ if (!$r=$mysql->get_dblist()) { setcookie("REMOTE_PASSWORD",$r[0]["pass"],0,"/"); if ($lang) $l="&lang=".substr($lang,0,2); // TODO : make it an absolute url ! (even in httpS :)) - header("Location: /admin/sql/index.php?server=1"); + header("Location: /alternc-sql/index.php?server=1"); exit(); } diff --git a/debian/alternc.cron.d b/debian/alternc.cron.d index 7633be7d..7cd02c68 100644 --- a/debian/alternc.cron.d +++ b/debian/alternc.cron.d @@ -15,3 +15,5 @@ # You may put this computing every week only or on your filer on busy services. 0 2 * * * www-data /usr/lib/alternc/spoolsize.php +# Once a week at 7am, optimise the AlternC database +0 1 * * 7 alterncpanel /usr/lib/alternc/alternc-dboptimize diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf index 4c8d7320..b1c1890e 100644 --- a/etc/alternc/templates/alternc/bureau.conf +++ b/etc/alternc/templates/alternc/bureau.conf @@ -4,6 +4,6 @@ RewriteEngine on RewriteRule ^/admin/(.*) /$1 [R=301,L] - alias /sql /usr/share/phpmyadmin + alias /alternc-sql /usr/share/phpmyadmin alias /webmail /usr/share/squirrelmail diff --git a/etc/alternc/templates/apache2/panel.conf b/etc/alternc/templates/apache2/panel.conf index 8e367d73..636eede0 100644 --- a/etc/alternc/templates/apache2/panel.conf +++ b/etc/alternc/templates/apache2/panel.conf @@ -4,7 +4,7 @@ RewriteEngine on RewriteRule ^/admin/(.*) /$1 - alias /admin/sql /usr/share/phpmyadmin + alias /alternc-sql /usr/share/phpmyadmin alias /webmail /usr/share/squirrelmail LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc diff --git a/src/Makefile b/src/Makefile index 0a906afc..a928a7cd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,7 +26,7 @@ # ---------------------------------------------------------------------- # SETUID=mail_add mail_del quota_edit quota_get mem_add mem_del -SCRIPTS=quota_edit.sh quota_get.sh sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh +SCRIPTS=quota_edit.sh quota_get.sh sqlbackup.sh rawstat.daily quota_init quota_delete update_domains.sh slave_dns sendmail spoolsize.php fixperms.sh alternc-check alternc-dboptimize LIBS=functions.sh functions_hosting.sh functions_dns.sh BIN=$(DESTDIR)/usr/lib/alternc/ diff --git a/src/alternc-dboptimize b/src/alternc-dboptimize new file mode 100644 index 00000000..e53858f7 --- /dev/null +++ b/src/alternc-dboptimize @@ -0,0 +1,4 @@ +#!/bin/bash + +# Optimize alternc databases +/usr/bin/mysqlcheck --defaults-file=/etc/alternc/my.cnf --quick --force --optimize --auto-repair --databases $(cat /etc/alternc/my.cnf |grep ^database|cut -d '"' -f 2) > /dev/null