From 6c67b9df82d02f172cf4672914603f642ad8c98b Mon Sep 17 00:00:00 2001
From: "andre.peters" <andre.peters@servercow.de>
Date: Sat, 9 Dec 2017 22:30:18 +0100
Subject: [PATCH] Replace name by IP, remove unused tables

---
 .../postfix/whitelist_forwardinghosts.sh      |  2 +-
 data/web/inc/init_db.inc.php                  | 45 -------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh b/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh
index 4ad5ab32..ab066d89 100755
--- a/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh
+++ b/data/Dockerfiles/postfix/whitelist_forwardinghosts.sh
@@ -6,7 +6,7 @@ while read QUERY; do
 		echo "500 dunno"
 		continue
 	fi
-	result=$(curl -s http://nginx:8081/forwardinghosts.php?host=${QUERY[1]})
+	result=$(curl -s http://172.22.1.251:8081/forwardinghosts.php?host=${QUERY[1]})
 	logger -t whitelist_forwardinghosts -p mail.info "Look up ${QUERY[1]} on whitelist, result $result"
 	echo ${result}
 done
diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php
index db3f2f38..a69e1f3e 100644
--- a/data/web/inc/init_db.inc.php
+++ b/data/web/inc/init_db.inc.php
@@ -237,51 +237,6 @@ function init_db_schema() {
         ),
         "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
       ),
-      "imap_user_shares" => array(
-        "cols" => array(
-          "from_user" => "VARCHAR(255) NOT NULL",
-          "to_user" => "VARCHAR(255) NOT NULL",
-          "dummy" => "CHAR(1) DEFAULT '1'",
-          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
-          "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("from_user", "to_user")
-          ),
-          "fkey" => array(
-            "fk_from_user_user_shares" => array(
-              "col" => "from_user",
-              "ref" => "mailbox.username",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
-      "imap_anyone_shares" => array(
-        "cols" => array(
-          "from_user" => "VARCHAR(255) NOT NULL",
-          "dummy" => "CHAR(1) DEFAULT '1'",
-          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
-          "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("from_user")
-          ),
-          "fkey" => array(
-            "fk_from_anyone_user_shares" => array(
-              "col" => "from_user",
-              "ref" => "mailbox.username",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
       "user_acl" => array(
         "cols" => array(
           "username" => "VARCHAR(255) NOT NULL",