adjusted configuration due to problems with mailcatcher

diff --git a/Vagrantfile b/Vagrantfile
index 015ceb83d99a9caac2f0c03c8024b53e25a53899..147f248810ba3d99b3f685ad7d8072102dac95df 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,8 +18,8 @@ hostname        = "vaprobash.dev"
 #   172.16.0.1  - 172.31.255.254
 #   192.168.0.1 - 192.168.255.254
 server_ip             = "192.168.22.10"
-server_memory         = "384" # MB
-server_swap           = "768" # Options: false | int (MB) - Guideline: Between one or two times the server_memory
+server_memory         = "400" # MB
+server_swap           = "800" # Options: false | int (MB) - Guideline: Between one or two times the server_memory
 server_timezone       = "UTC"
 
 # Database Configuration
@@ -252,8 +252,8 @@ Vagrant.configure("2") do |config|
   # Install Screen
   # config.vm.provision "shell", path: "#{github_url}/scripts/screen.sh"
 
-  # Install Mailcatcher
-  config.vm.provision "shell", path: "#{github_url}/scripts/mailcatcher.sh"
+  # Install config Mailcatcher
+  # ls -config.vm.provision "shell", path: "#{github_url}/scripts/mailcatcher.sh"
 
   # Install git-ftp
   # config.vm.provision "shell", path: "#{github_url}/scripts/git-ftp.sh", privileged: false

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index 7507b0715a048b9f990f3263d57b8ea19c17dfe7..476a1cd1c263491ac1b45b770c98bd29f0fa063e 100644 (file)
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -8,6 +8,13 @@
 rm -rf /var/www/
 ln -fs /vagrant /var/www
 
+#delete .htconfig.php file if it exists to have a fresh friendica 
+#installation
+if [ -f /vagrant/.htconfig.php ]
+  then
+    rm /vagrant/.htconfig.php
+fi
+
 #create the friendica database
 echo "create database friendica" | mysql -u root -proot
 
@@ -16,5 +23,5 @@ echo "*/10 * * * * cd /vagrant; /usr/bin/php include/poller.php" >> friendicacro
 crontab friendicacron
 rm friendicacron
 
-#Optional: checkout addon repository
+#Optional: checkout addon repositroy
 #git clone https://github.com/friendica/friendica-addons.git /vagrant/addon
\ No newline at end of file