No timeout problem anymore in preview.

[friendica.git] / util / vagrant_provision.sh

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index f01f0f66a13d9431cee2607a04a47ba9c175b151..39db0d73c42e0cfea95323a0049dfd723f8b38ad 100644 (file)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -32,9 +32,15 @@ sudo apt-get install -y apache2
 sudo a2enmod rewrite actions ssl
 sudo cp /vagrant/util/vagrant_vhost.sh /usr/local/bin/vhost
 sudo chmod guo+x /usr/local/bin/vhost
-sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica.dev
-sudo a2dissite 000-default
-sudo service apache2 restart
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    sudo vhost -s 192.168.22.10.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-trusty.dev
+    sudo a2dissite 000-default
+    sudo service apache2 restart
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    sudo vhost -s 192.168.22.11.xip.io -d /var/www -p /etc/ssl/xip.io -c xip.io -a friendica-xenial.dev
+    sudo a2dissite 000-default
+    sudo systemctl restart apache2
+fi
 
 #Install php
 if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
@@ -45,7 +51,7 @@ if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
     sudo service apache2 restart
 elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
     echo ">>> Installing PHP7"
-    sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd
+    sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring
     sudo apt-get install -y imagemagick
     sudo apt-get install -y php-imagick
     sudo systemctl restart apache2
@@ -77,7 +83,11 @@ fi
 
 #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"
+if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
+    debconf-set-selections <<< "postfix postfix/mailname string friendica-trusty.dev"
+elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
+    debconf-set-selections <<< "postfix postfix/mailname string friendica-xenial.dev"
+fi
 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
@@ -90,7 +100,7 @@ sudo ln -fs /vagrant /var/www
 cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
 
 # create the friendica database
-echo "create database friendica" | mysql -u root -proot
+echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | mysql -u root -proot
 # import test database
 $MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql
 
@@ -100,4 +110,4 @@ sudo crontab friendicacron
 sudo rm friendicacron
 
 #Optional: checkout addon repositroy
-sudo git clone https://github.com/friendica/friendica-addons.git /vagrant/addon
+#sudo git clone https://github.com/friendica/friendica-addons.git /vagrant/addon