adjusted configuration due to problems with mailcatcher
This commit is contained in:
parent
c23de3a64e
commit
e89e8d2914
2 changed files with 12 additions and 5 deletions
8
Vagrantfile
vendored
8
Vagrantfile
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue