diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-17 10:30:34 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-17 10:30:34 +0200 |
commit | 69737b703ab1d9b9e49315f12c3aca8cf6df70ac (patch) | |
tree | fd533bcafe02475fbc19681cc764d75fe6f16e12 /Vagrantfile | |
parent | 678e07c54485c6cc61b2ac18aa5ceaa290a6fcbd (diff) | |
parent | 4c7efdba402b6b8ee0363b6f1dc2c202303d7623 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.
Diffstat (limited to 'Vagrantfile')
-rw-r--r-- | Vagrantfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Vagrantfile b/Vagrantfile index addc6b0f4..2afed9279 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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' # Add repo for NodeJS -curl -sL https://deb.nodesource.com/setup_10.x | sudo bash - +curl -sL https://deb.nodesource.com/setup_12.x | sudo bash - # 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"]} |