hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add vagrant dir to ignored, increase vm memory to 4G

Browse Source
This commit is contained in:
Benoît Burnichon
2015-03-04 16:33:59 +01:00
parent 4c3f0ba959
commit 2e74467c79
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -59,6 +59,7 @@ behat.yml
# Exclude vagrant configuration file # Exclude vagrant configuration file
/.vagrant /.vagrant
/vagrant
# Exclude crossdomain.xml file it's generated # Exclude crossdomain.xml file it's generated
/www/crossdomain.xml /www/crossdomain.xml

2
resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml vendored
View File

@@ -5,7 +5,7 @@ vagrantfile-local:
box: puphpet/debian75-x64 box: puphpet/debian75-x64
box_url: puphpet/debian75-x64 box_url: puphpet/debian75-x64
hostname: phraseanet-php54-nginx hostname: phraseanet-php54-nginx
memory: '2048' memory: '4096'
cpus: '2' cpus: '2'
chosen_provider: virtualbox chosen_provider: virtualbox
network: network: