Merge remote-tracking branch 'origin/master' into micha

2017-02-16 15:05:37 +01:00 · 2017-02-16 15:05:37 +01:00 · ee9bb7f04f
parent f09ecf0cbd 918240fe32
commit ee9bb7f04f
2 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,7 @@
 tusd/data
 cover.out
 data/
-.infra/env.sh
-.infra/env.*.sh
+.infra/env.*
 .infra/ssh/tusd.pem
 .infra/Frey-residu*
 .infra/ssh/frey-tusd.pem
--- a/.infra/group_vars/all/_frey.yml
+++ b/.infra/group_vars/all/_frey.yml
@ -27,6 +27,7 @@ hostname: "{{ fqdn.split('.')[0] }}"

 # nodejs
 nodejs_yarn: false
+nodejs_install_npm_user: root
 nodejs_npm_global_packages:
  - name: yarn