From 18f59b6bfe73a4d41c0a13a639f20cbcf8f8eddf Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Sat, 19 Nov 2016 18:05:38 +0100 Subject: [PATCH] Vagrant: corrected hostnames --- util/vagrant_provision.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index f01f0f66a1..972082d0dc 100644 --- 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 @@ -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