Browse Source

Merge pull request #7703 from tobiasd/20191001-Vagrant

modified Vagrant devel VM (PHP 7.3, proper composer)
Hypolite Petovan 1 year ago
committed by GitHub
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
  1. +2
  2. +10

+ 2
- 2
Vagrantfile View File

@@ -6,8 +6,8 @@ server_timezone = "UTC"
public_folder = "/vagrant"

Vagrant.configure(2) do |config|
# Set server to Ubuntu 16.04 = "ubuntu/xenial64"
# Set server to Debian 10 / Buster 64bit = "debian/buster64"

# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs

+ 10
- 7
bin/dev/ View File

@@ -37,9 +37,9 @@ sudo apt-get install -y apache2
sudo a2enmod rewrite actions ssl
sudo cp /vagrant/bin/dev/ /usr/local/bin/vhost
sudo chmod guo+x /usr/local/bin/vhost
sudo vhost -s -d /var/www -p /etc/ssl/ -c -a friendica.local
sudo a2dissite 000-default
sudo service apache2 restart
sudo vhost -s -d /var/www -p /etc/ssl/ -c -a friendica.local
sudo a2dissite 000-default
sudo service apache2 restart

#Install php
echo ">>> Installing PHP7"
@@ -48,9 +48,9 @@ sudo systemctl restart apache2

#Install mysql
echo ">>> Installing Mysql"
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password root"
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password root"
sudo apt-get install -qq mysql-server
sudo debconf-set-selections <<< "mariadb-server mariadb-server/root_password password root"
sudo debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password root"
sudo apt-get install -qq mariadb-server
# enable remote access
# setting the mysql bind-address to allow connections from everywhere
sed -i "s/bind-address.*/bind-address =" /etc/mysql/my.cnf
@@ -76,6 +76,9 @@ 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

# Friendica needs git for fetching some dependencies
sudo apt-get install -y git

#make the vagrant directory the docroot
sudo rm -rf /var/www/
sudo ln -fs /vagrant /var/www
@@ -83,7 +86,7 @@ sudo ln -fs /vagrant /var/www
# install deps with composer
sudo apt install unzip
cd /var/www
php bin/composer.phar install
sudo -u www-data php bin/composer.phar install

# initial config file for friendica in vagrant
cp /vagrant/mods/local.config.vagrant.php /vagrant/config/local.config.php