aboutsummaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-03-20 09:43:23 -0700
committerMatt Friedman <maf675@gmail.com>2016-04-28 08:36:49 -0700
commit3cd0c53118b0e339c644d760bcb914998c455209 (patch)
tree6a341b4de474b053070613da872b4543f0a54148 /vagrant
parent6196e4ae4d5bec5d43dbf0db7c19a8ba4e43ae9e (diff)
downloadforums-3cd0c53118b0e339c644d760bcb914998c455209.tar
forums-3cd0c53118b0e339c644d760bcb914998c455209.tar.gz
forums-3cd0c53118b0e339c644d760bcb914998c455209.tar.bz2
forums-3cd0c53118b0e339c644d760bcb914998c455209.tar.xz
forums-3cd0c53118b0e339c644d760bcb914998c455209.zip
[ticket/14547] Use package compatible with phpBB requirements
PHPBB3-14547
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/after.sh3
-rw-r--r--vagrant/bootstrap.yaml4
2 files changed, 7 insertions, 0 deletions
diff --git a/vagrant/after.sh b/vagrant/after.sh
index 440f1bc49e..09a6fe25fa 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -27,4 +27,7 @@ sudo chown -R vagrant /tmp/phpbb.sqlite3
# Add DEBUG mode to phpBB to remove annoying installer warnings
sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG}
+# Update the PHP memory limits (enough to allow phpunit tests to run)
+sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php5/fpm/php.ini
+
echo "Your board is ready at http://192.168.10.10/"
diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml
index 06a6147b86..1c2b265712 100644
--- a/vagrant/bootstrap.yaml
+++ b/vagrant/bootstrap.yaml
@@ -22,6 +22,10 @@ sites:
databases:
- phpbb
+variables:
+ - key: APP_ENV
+ value: local
+
# blackfire:
# - id: foo
# token: bar