Merge pull request #4493 from tobiasd/20180223-vagrant

Some changes to the Vagrant configuration

diff --git a/Vagrantfile b/Vagrantfile
index df019dd06fd25e196f63490b2c0e1405fccdeda8..e62efc618e40c07452a73c68a95d982884883ae4 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
   # 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
-  config.vm.hostname = "friendica-xenial.dev"
+  config.vm.hostname = "friendica.dev"
 
   # Create a static IP
   config.vm.network :private_network, ip: server_ip

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index 2029d97d58807cbfede8e29fb071cc11cff3569b..7ca5a1f4e3d33e7f1ec327249e66160ee01ae7df 100755 (executable)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -92,5 +92,6 @@ echo "*/10 * * * * cd /vagrant; /usr/bin/php scripts/worker.php" >> friendicacro
 sudo crontab friendicacron
 sudo rm friendicacron
 
-#Optional: checkout addon repositroy
-#sudo git clone https://github.com/friendica/friendica-addons.git /vagrant/addon
+# friendica needs write access to /tmp
+sudo chmod 777 /tmp
+