Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index 9988f36256ecc61eac5b31bef889bc55278dcdc8..cd9f632deacd8166b46491208c6b105951262fd1 100644 (file)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -63,6 +63,13 @@ SQL="${Q1}${Q2}"
 $MYSQL -uroot -proot -e "$SQL"
 service mysql restart
 
+#configure rudimentary mail server (local delivery only)
+#add Friendica accounts for local user accounts, use email address like vagrant@friendica.dev, read the email with 'mail'.
+debconf-set-selections <<< "postfix postfix/mailname string friendica.dev"
+debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'"
+apt-get install -y postfix
+apt-get install mailutils
+
 #make the vagrant directory the docroot
 sudo rm -rf /var/www/
 sudo ln -fs /vagrant /var/www