Merge branch 'vagrant-fix' into 'develop'

Upgrade Vagrant Node.js to 10.x, fixes #56

Closes #56

See merge request gab/social/gab-social!16
This commit is contained in:
Rob Colbert 2019-07-22 21:13:46 +00:00
commit 4abdf8404e
2 changed files with 3 additions and 2 deletions

3
.gitignore vendored
View File

@ -13,6 +13,7 @@
/db/*.sqlite3-journal /db/*.sqlite3-journal
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
/*.log
/log/* /log/*
!/log/.keep !/log/.keep
/tmp /tmp
@ -58,4 +59,4 @@ yarn-debug.log
# Ignore Docker option files # Ignore Docker option files
docker-compose.override.yml docker-compose.override.yml
dump.rdb dump.rdb

2
Vagrantfile vendored
View File

@ -12,7 +12,7 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main' sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
# Add repo for NodeJS # Add repo for NodeJS
curl -sL https://deb.nodesource.com/setup_8.x | sudo bash - curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
# Add firewall rule to redirect 80 to PORT and save # Add firewall rule to redirect 80 to PORT and save
sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]} sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]}