Merge branch 'master' back into develop

[friendica.git] / util / vagrant_provision.sh

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index ae354bb42c95f78040074d59674e1f04a4e8fd4b..ac24659662496b1fffbda3c6360bce52fe04e2cd 100644 (file)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -28,6 +28,8 @@ sudo openssl x509 -req -days 365 -in "$SSL_DIR/xip.io.csr" -signkey "$SSL_DIR/xi
 
 #Install apache2
 echo ">>> Installing Apache2 webserver"
+# The package python-software-properties provides add-apt-repository on Ubuntu Precise Server
+sudo apt-get install python-software-properties
 sudo add-apt-repository -y ppa:ondrej/apache2
 sudo apt-key update
 sudo apt-get update
@@ -61,19 +63,25 @@ 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'"
+sudo apt-get install -y postfix mailutils libmailutils-dev
+sudo echo -e "friendica1:      vagrant\nfriendica2:    vagrant\nfriendica3:    vagrant\nfriendica4:    vagrant\nfriendica5:    vagrant" >> /etc/aliases && sudo newaliases
+
 #make the vagrant directory the docroot
 sudo rm -rf /var/www/
 sudo ln -fs /vagrant /var/www
 
-#delete .htconfig.php file if it exists to have a fresh friendica 
-#installation
-if [ -f /vagrant/.htconfig.php ]
-  then
-    sudo rm /vagrant/.htconfig.php
-fi
+# initial config file for friendica in vagrant
+cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
 
-#create the friendica database
+# create the friendica database
 echo "create database friendica" | mysql -u root -proot
+# import test database
+$MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql
 
 #create cronjob
 echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacron