summaryrefslogtreecommitdiff
path: root/vagrant
diff options
context:
space:
mode:
authorvarac <varac@users.noreply.github.com>2016-01-12 20:01:38 +0100
committervarac <varac@users.noreply.github.com>2016-01-12 20:01:38 +0100
commita9c9e50d95316d9750a1ae07c2cce3f9b95acfd0 (patch)
treeb4f9c4509d5435f40592691c048f2cfe23138660 /vagrant
parent986a0ac73585d8f8427c6fa4818cbc662b59cef3 (diff)
parent98b38f15839eeee43a0c817de081a3beb494efaa (diff)
Merge pull request #94 from pixelated/run_git_as_user
Run git as user, not root
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/configure-leap.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/vagrant/configure-leap.sh b/vagrant/configure-leap.sh
index 00811144..96344400 100755
--- a/vagrant/configure-leap.sh
+++ b/vagrant/configure-leap.sh
@@ -10,6 +10,7 @@ NODE='node1'
SUDO="sudo -u ${USER}"
PROVIDERDIR="/home/${USER}/leap/configuration"
LEAP="$SUDO /usr/local/bin/leap"
+GIT="$SUDO git"
echo '==============================================='
echo 'configuring leap'
@@ -43,9 +44,9 @@ echo '{ "webapp": { "admins": ["testadmin"] } }' > services/webapp.json
$LEAP $OPTS compile
-git init
-git add .
-git commit -m'configured provider'
+$GIT init
+$GIT add .
+$GIT commit -m'configured provider'
$LEAP $OPTS node init $NODE
if [ $? -eq 1 ]; then
@@ -61,8 +62,8 @@ gem install rake
$LEAP $OPTS -v 2 deploy
set +e
-git add .
-git commit -m'initialized and deployed provider'
+$GIT add .
+$GIT commit -m'initialized and deployed provider'
set -e
# Vagrant: leap_mx fails to start on jessie