keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adjusted configuration due to problems with mailcatcher

Browse source
This commit is contained in:
Hauke Altmann 2014-06-20 18:32:40 +02:00
parent c23de3a64e
commit e89e8d2914
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Vagrantfile vendored
View file

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

9
util/vagrant_provision.sh
View file

@ -8,6 +8,13 @@
rm -rf /var/www/ rm -rf /var/www/
ln -fs /vagrant /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 #create the friendica database
echo "create database friendica" | mysql -u root -proot 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 crontab friendicacron
rm friendicacron rm friendicacron
#Optional: checkout addon repository #Optional: checkout addon repositroy
#git clone https://github.com/friendica/friendica-addons.git /vagrant/addon #git clone https://github.com/friendica/friendica-addons.git /vagrant/addon