Add a setup step to Dovecot which grants permission to the postfix database to the...

diff --git a/dovecot/Makefile b/dovecot/Makefile
index 495f5872c6b5e603b2c6d4bea831de2c1d9988bd..e57b6d1fec113647edb8e4021ee243c1b1e28e9b 100644 (file)
--- a/dovecot/Makefile
+++ b/dovecot/Makefile
@@ -4,8 +4,13 @@ INPUTS := dovecot-sql.conf.ext local.conf
 
 OUTPUTS := $(INPUTS:%=$(DST)/%)
 
 
 OUTPUTS := $(INPUTS:%=$(DST)/%)
 

-all: $(OUTPUTS)
+all: $(OUTPUTS) setup
+
+.PHONY: setup

 
 $(DST)/%: %
        @mkdir -p $(@D)
        cp $^ $@
 
 $(DST)/%: %
        @mkdir -p $(@D)
        cp $^ $@

+
+setup:
+       @./setup-dovecot.sh

diff --git a/dovecot/setup-dovecot.sh b/dovecot/setup-dovecot.sh
new file mode 100755 (executable)
index 0000000..7171f19
--- /dev/null
+++ b/dovecot/setup-dovecot.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [[ -z "$( mysql -u root -e 'SELECT User FROM mysql.user WHERE User = "dovecot"' )" ]]; then
+    echo Creating \"dovecot\" user.
+    mysql -u root -e 'CREATE USER "dovecot"@"localhost" IDENTIFIED BY "dovecot"'
+    if [[ -n "$( mysql -u root -e 'SHOW DATABASES LIKE "postfix"' )" ]]; then
+        mysql -u root -e 'GRANT ALL PRIVILEGES ON dovecot.* TO "dovecot"@"localhost"'
+        mysql -u root -e 'FLUSH PRIVILEGES'
+    fi
+fi

diff --git a/postfixadmin/setup-postfixadmin.sh b/postfixadmin/setup-postfixadmin.sh
index b19e9e21575668ebaa693abd9a3188d3951e21f4..11630e07a0d46760366eaa1aedf71f502a122164 100755 (executable)
--- a/postfixadmin/setup-postfixadmin.sh
+++ b/postfixadmin/setup-postfixadmin.sh
@@ -9,6 +9,9 @@ if [[ -z "$( mysql -u root -e 'SHOW DATABASES LIKE "postfix"' )" ]]; then
     echo Creating \"postfix\" database.
     mysql -u root -e 'CREATE DATABASE postfix'
     mysql -u root -e 'GRANT ALL PRIVILEGES ON postfix.* TO "postfix"@"localhost"'
     echo Creating \"postfix\" database.
     mysql -u root -e 'CREATE DATABASE postfix'
     mysql -u root -e 'GRANT ALL PRIVILEGES ON postfix.* TO "postfix"@"localhost"'

+    if [[ -n "$( mysql -u root -e 'SELECT User FROM mysql.user WHERE User = "dovecot"' )" ]]; then
+        mysql -u root -e 'GRANT ALL PRIVILEGES ON postfix.* TO "dovecot"@"localhost"'
+    fi

     mysql -u root -e 'FLUSH PRIVILEGES'
 fi
 
     mysql -u root -e 'FLUSH PRIVILEGES'
 fi