Merge pull request #11224 from annando/statistics-separator

[friendica.git] / bin / dev / vagrant_provision.sh

diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh
index 4de6a4684dc6f33c4c166cf8f9781844fe51b8dd..3992550ee15e4ff1a2819310c0c5d95f86000dc5 100755 (executable)
--- a/bin/dev/vagrant_provision.sh
+++ b/bin/dev/vagrant_provision.sh
@@ -54,6 +54,14 @@ echo ">>> Installing PHP7"
 apt-get install -qq php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring php-xml imagemagick php-imagick php-zip
 systemctl restart apache2
 
+echo ">>> Installing PHP8"
+apt-get install -qq -y lsb-release ca-certificates apt-transport-https software-properties-common gnupg
+echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/sury-php.list
+wget -qO - https://packages.sury.org/php/apt.gpg | sudo apt-key add -
+apt update
+apt-get install -qq php8.0 php8.0-cli php8.0-mysql php8.0-curl php8.0-gd php8.0-mbstring php8.0-xml php8.0-imagick php8.0-zip
+systemctl restart apache2
+
 #Install mysql
 echo ">>> Installing Mysql"
 debconf-set-selections <<< "mariadb-server mariadb-server/root_password password root"
@@ -82,7 +90,7 @@ echo ">>> Installing 'Local Only' postfix"
 debconf-set-selections <<< "postfix postfix/mailname string friendica.local"
 debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Local Only'"
 apt-get install -qq postfix mailutils libmailutils-dev
-echo -e "friendica1:   vagrant\nfriendica2:    vagrant\nfriendica3:    vagrant\nfriendica4:    vagrant\nfriendica5:    vagrant" >> /etc/aliases && newaliases
+echo -e "$ADMIN_NICK:  vagrant\n$USER_NICK:    vagrant" >> /etc/aliases && newaliases
 
 # Friendica needs git for fetching some dependencies
 echo ">>> Installing git"
@@ -93,13 +101,8 @@ echo ">>> Symlink /var/www to /vagrant"
 rm -rf /var/www/
 ln -fs /vagrant /var/www
 
-# install deps with composer
-echo ">>> Installing php requirements"
-apt install unzip
+# Setup Friendica
 cd /var/www
-php bin/composer.phar install
-
-
 echo ">>> Setup Friendica"
 
 # copy the .htaccess-dist file to .htaccess so that rewrite rules work
@@ -107,8 +110,6 @@ cp /vagrant/.htaccess-dist /vagrant/.htaccess
 
 # create the friendica database
 echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | $MYSQL -u root -proot
-# import test database (disabled because too old)
-#$MYSQL -uroot -proot friendica < /vagrant/friendica_test_data.sql
 
 # install friendica
 bin/console autoinstall -f /vagrant/mods/local.config.vagrant.php
@@ -122,10 +123,6 @@ bin/console user password "$ADMIN_NICK" "$ADMIN_PASSW"
 bin/console user add "$USER_NICK" "$USER_NICK" "$USER_NICK@friendica.local" en
 bin/console user password "$USER_NICK" "$USER_PASSW"
 
-# set the admin
-bin/console config config admin_email ""$ADMIN_NICK@friendica.local""
-
-
 # create cronjob - activate if you have enough memory in you dev VM
 # cronjob runs as www-data user
 echo ">>> Installing cronjob"