nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Vagrant: Allow to choose between Ubuntu 14.04 und 16.04

Browse source
This commit is contained in:
Silke Meyer 2016-11-19 16:08:08 +01:00
parent 9657fed705
commit 5024b7426c
2 changed files with 59 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Vagrantfile vendored
View file

@ -1,14 +1,15 @@
server_ip = "192.168.22.10" server_ip_trusty = "192.168.22.10"
server_ip_xenial = "192.168.22.11"
server_memory = "1024" # MB server_memory = "1024" # MB
server_timezone = "UTC" server_timezone = "UTC"
public_folder = "/vagrant" public_folder = "/vagrant"
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
# Set server to Ubuntu 14.04 # Set server to Ubuntu 14.04
config.vm.box = "ubuntu/trusty64" config.vm.define "trusty" do |trusty|
trusty.vm.box = "ubuntu/trusty64"
# Disable automatic box update checking. If you disable this, then # Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs # boxes will only be checked for updates when the user runs
@ -18,13 +19,36 @@ Vagrant.configure(2) do |config|
# Create a hostname, don't forget to put it to the `hosts` file # Create a hostname, don't forget to put it to the `hosts` file
# This will point to the server's default virtual host # This will point to the server's default virtual host
# TO DO: Make this work with virtualhost along-side xip.io URL # TO DO: Make this work with virtualhost along-side xip.io URL
config.vm.hostname = "friendica.dev" trusty.vm.hostname = "friendica-trusty.dev"
# Create a static IP # Create a static IP
config.vm.network :private_network, ip: server_ip trusty.vm.network :private_network, ip: server_ip_trusty
# Share a folder between host and guest # Share a folder between host and guest
config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant" trusty.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
end
# Set server to Ubuntu 16.04
config.vm.define "xenial" do |xenial|
xenial.vm.box = "ubuntu/xenial64"
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
# `vagrant box outdated`. This is not recommended.
# config.vm.box_check_update = false
# Create a hostname, don't forget to put it to the `hosts` file
# This will point to the server's default virtual host
# TO DO: Make this work with virtualhost along-side xip.io URL
xenial.vm.hostname = "friendica-xenial.dev"
# Create a static IP
xenial.vm.network :private_network, ip: server_ip_xenial
# Share a folder between host and guest
xenial.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
end
# Provider-specific configuration so you can fine-tune various # Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options. # backing providers for Vagrant. These expose provider-specific options.

15
util/vagrant_provision.sh
View file

@ -37,11 +37,19 @@ sudo a2dissite 000-default
sudo service apache2 restart sudo service apache2 restart
#Install php #Install php
if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
echo ">>> Installing PHP5" echo ">>> Installing PHP5"
sudo apt-get install -y php5 libapache2-mod-php5 php5-cli php5-mysql php5-curl php5-gd sudo apt-get install -y php5 libapache2-mod-php5 php5-cli php5-mysql php5-curl php5-gd
sudo apt-get install -y imagemagick sudo apt-get install -y imagemagick
sudo apt-get install -y php5-imagick sudo apt-get install -y php5-imagick
sudo service apache2 restart 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 imagemagick
sudo apt-get install -y php-imagick
sudo systemctl restart apache2
fi
#Install mysql #Install mysql
@ -59,7 +67,12 @@ Q1="GRANT ALL ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;"
Q2="FLUSH PRIVILEGES;" Q2="FLUSH PRIVILEGES;"
SQL="${Q1}${Q2}" SQL="${Q1}${Q2}"
$MYSQL -uroot -proot -e "$SQL" $MYSQL -uroot -proot -e "$SQL"
if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
service mysql restart service mysql restart
elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
systemctl restart mysql
fi
#configure rudimentary mail server (local delivery only) #configure rudimentary mail server (local delivery only)
@ -87,4 +100,4 @@ sudo crontab friendicacron
sudo rm friendicacron sudo rm friendicacron
#Optional: checkout addon repositroy #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