From 756993878bbafa909e15daf66b03b8d569f627b2 Mon Sep 17 00:00:00 2001
From: quenenni <la.jolie@paquerette.org>
Date: Thu, 17 Aug 2017 04:26:29 +0200
Subject: [PATCH] =?UTF-8?q?informations=20d'installation=20et=20mise=20?=
 =?UTF-8?q?=C3=A0=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/dovecot/dovecot-dict-quota.conf      |  4 ++--
 install/mysql.sql                                  | 14 +++++++++++++-
 install/upgrades/3.4.8.sql                         | 10 ++++++++++
 wheezy/alternc-dict-quota.conf                     |  4 ++--
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 install/upgrades/3.4.8.sql

diff --git a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf
index b22e98ef..8ad06548 100644
--- a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf
+++ b/etc/alternc/templates/dovecot/dovecot-dict-quota.conf
@@ -16,13 +16,13 @@ connect=host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_ma
 
 map {
   pattern = priv/quota/storage
-  table = dovecot_view
+  table = dovecot_quota
   username_field = user
   value_field = quota_dovecot 
 }
 map {
  pattern = priv/quota/messages
- table = dovecot_view
+ table = dovecot_quota
  username_field = user
  value_field = nb_messages
 }
diff --git a/install/mysql.sql b/install/mysql.sql
index 037ca611..ba807b47 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -582,6 +582,17 @@ CREATE TABLE IF NOT EXISTS `cron` (
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1;
 
 
+--
+-- Structure de la table `dovecot_quota`
+--
+
+CREATE TABLE IF NOT EXISTS `dovecot_quota` (
+  `user` varchar(320) NOT NULL,
+  `quota_dovecot` bigint(20) NOT NULL DEFAULT '0',
+  `nb_messages` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`user`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
 
 --
 -- Structure de la vue `dovecot_view`
@@ -661,6 +672,7 @@ where
 CREATE TABLE IF NOT EXISTS `piwik_users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
+  `passwd` varchar(255) NOT NULL,
   `login` varchar(255) NOT NULL,
   `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
@@ -693,7 +705,7 @@ CREATE TABLE IF NOT EXISTS `default_subdomains` (
 
 INSERT IGNORE INTO `default_subdomains` (`sub`, `domain_type`, `domain_type_parameter`, `concerned`) VALUES
 ('www', 'VHOST', '%%DOMAINDIR%%', 'MAIN'),
-('mail', 'WEBMAIL', '', 'MAIN'),
+('mail', 'ROUNDCUBE', '', 'MAIN'),
 ('', 'URL', 'http://www.%%DOMAIN%%', 'MAIN'),
 ('www', 'URL', 'http://www.%%TARGETDOM%%', 'SLAVE'),
 ('mail', 'URL', 'http://mail.%%TARGETDOM%%', 'SLAVE'),
diff --git a/install/upgrades/3.4.8.sql b/install/upgrades/3.4.8.sql
new file mode 100644
index 00000000..d8764808
--- /dev/null
+++ b/install/upgrades/3.4.8.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS `dovecot_quota` (
+  `user` varchar(320) NOT NULL,
+  `quota_dovecot` bigint(20) NOT NULL DEFAULT '0',
+  `nb_messages` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`user`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `piwik_users` ADD `passwd` VARCHAR(255) NOT NULL AFTER `login`;
+
+UPDATE `default_subdomains` SET `domain_type` = 'ROUNDCUBE' WHERE `domain_type` = 'WEBMAIL';
diff --git a/wheezy/alternc-dict-quota.conf b/wheezy/alternc-dict-quota.conf
index b22e98ef..8ad06548 100644
--- a/wheezy/alternc-dict-quota.conf
+++ b/wheezy/alternc-dict-quota.conf
@@ -16,13 +16,13 @@ connect=host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_ma
 
 map {
   pattern = priv/quota/storage
-  table = dovecot_view
+  table = dovecot_quota
   username_field = user
   value_field = quota_dovecot 
 }
 map {
  pattern = priv/quota/messages
- table = dovecot_view
+ table = dovecot_quota
  username_field = user
  value_field = nb_messages
 }