From 42000fd748abc7c2238351bee4d5e2c18d2af977 Mon Sep 17 00:00:00 2001
From: Jeff Moe <moe@libre.is>
Date: Sun, 1 Sep 2024 10:34:12 -0600
Subject: [PATCH] More mail SQL

---
 .../locale/en/LC_MESSAGES/mail-libre-is.po    | 32 ++++++++-----------
 docs/_source/mail-libre-is.rst                | 26 +++++++++++++++
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po b/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po
index 44f5bed..64922a7 100644
--- a/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po
+++ b/docs/_source/locale/en/LC_MESSAGES/mail-libre-is.po
@@ -30,8 +30,8 @@ msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:6
 msgid ""
-"Setting up Internet mail servers is a pain. It's nothing like just "
-"setting up a web server... This install is based on this guide:"
+"Setting up Internet mail servers is a pain. It's nothing like just setting "
+"up a web server... This install is based on this guide:"
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:10
@@ -88,9 +88,9 @@ msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:41
 msgid ""
-"The Apache webserver is used out of laziness as it allows easy "
-"certificate updates with certbot. A webmail server won't be running on "
-"the main mail server."
+"The Apache webserver is used out of laziness as it allows easy certificate "
+"updates with certbot. A webmail server won't be running on the main mail "
+"server."
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:50
@@ -115,8 +115,8 @@ msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:91
 msgid ""
-"Note, the licensing of Redis has gone bad. The version in Debian is OK. "
-"But in the future, probably replace with a fork."
+"Note, the licensing of Redis has gone bad. The version in Debian is OK. But "
+"in the future, probably replace with a fork."
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:100
@@ -133,8 +133,8 @@ msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:110
 msgid ""
-"Encryption certificates with Let's Encrypt. Not using an Apache webserver"
-" on the mail server makes getting new certificates a bit more complex."
+"Encryption certificates with Let's Encrypt. Not using an Apache webserver on "
+"the mail server makes getting new certificates a bit more complex."
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:125
@@ -143,15 +143,15 @@ msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:132
 msgid ""
-"Note, since IPv6 isn't being used, the dovecot install barfs. Edit "
-"/etc/dovecot/dovecot.conf and add this line, where appropriate:"
+"Note, since IPv6 isn't being used, the dovecot install barfs. Edit /etc/"
+"dovecot/dovecot.conf and add this line, where appropriate:"
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:139
 msgid ""
-"Note, this is removing the \"::\" from listen, which using IPv6. Then re-"
-"run the install so the packages are happy. Note, the re-install won't "
-"overwrite the \"listen\" change."
+"Note, this is removing the \"::\" from listen, which using IPv6. Then re-run "
+"the install so the packages are happy. Note, the re-install won't overwrite "
+"the \"listen\" change."
 msgstr ""
 
 #: ../../../_source/mail-libre-is.rst:159
@@ -181,7 +181,3 @@ msgstr ""
 #: ../../../_source/mail-libre-is.rst:179
 msgid "Perhaps these too."
 msgstr ""
-
-#~ msgid "Just usingi encrypted IMAPS, not POP."
-#~ msgstr ""
-
diff --git a/docs/_source/mail-libre-is.rst b/docs/_source/mail-libre-is.rst
index b0718ed..e4784de 100644
--- a/docs/_source/mail-libre-is.rst
+++ b/docs/_source/mail-libre-is.rst
@@ -66,13 +66,39 @@ Change password to something secure.
 .. code-block:: sql
 
   CREATE DATABASE mailserver;
+
   GRANT ALL ON mailserver.* TO 'mailadmin'@'localhost' IDENTIFIED BY 'password';
+
   GRANT SELECT ON mailserver.* TO 'mailserver'@'127.0.0.1' IDENTIFIED BY 'password';
+
+  USE mailserver;
+
   CREATE TABLE IF NOT EXISTS `virtual_domains` (
    `id` int(11) NOT NULL auto_increment,
    `name` varchar(50) NOT NULL,
    PRIMARY KEY (`id`)
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+  CREATE TABLE IF NOT EXISTS `virtual_users` (
+   `id` int(11) NOT NULL auto_increment,
+   `domain_id` int(11) NOT NULL,
+   `email` varchar(100) NOT NULL,
+   `password` varchar(150) NOT NULL,
+   `quota` bigint(11) NOT NULL DEFAULT 0,
+   PRIMARY KEY (`id`),
+   UNIQUE KEY `email` (`email`),
+   FOREIGN KEY (domain_id) REFERENCES virtual_domains(id) ON DELETE CASCADE
+   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+  CREATE TABLE IF NOT EXISTS `virtual_aliases` (
+   `id` int(11) NOT NULL auto_increment,
+   `domain_id` int(11) NOT NULL,
+   `source` varchar(100) NOT NULL,
+   `destination` varchar(100) NOT NULL,
+   PRIMARY KEY (`id`),
+   FOREIGN KEY (domain_id) REFERENCES virtual_domains(id) ON DELETE CASCADE
+   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
   EXIT