From 7a2ec49b6dca595f34459303884c57a140e77182 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 8 Oct 2018 23:21:05 -0400 Subject: [PATCH] update git settings --- install.sh | 5 ++--- vars | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 528c086..384e191 100755 --- a/install.sh +++ b/install.sh @@ -199,17 +199,16 @@ fi if [ $usegit = True ] ; then echo -e "\tCloning django project" - ssh-agent bash -c 'ssh-add $gitkey 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; git init 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; git remote add origin $giturl 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; - git pull origin master 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc;' + git pull origin master 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc; echo -e "\tInstalling pip requirements" pip install -r requirements.txt 1>> $gitlogloc 2>> $gitlogloc 3>> $gitlogloc fi # collect static, migrate echo -e "\tCollecting static" -python manage.py collectstatic 1>> $djalogloc 2>> $djalogloc 3>> $djalogloc +python manage.py collectstatic --noinput 1>> $djalogloc 2>> $djalogloc 3>> $djalogloc if [ $? -ne 0 ] ; then echo -e "Failed to collect static files. $djamsg" exit 1 diff --git a/vars b/vars index 46a4a0b..fe9a0c6 100644 --- a/vars +++ b/vars @@ -4,7 +4,7 @@ export projectname="" export hostname="" export usegit=False # if you have a django git project export giturl="" # url for git project -export gitkey="" # IdentityFile +# MAKE SURE root HAS A DEPLOY KEY install_epel_release=False # general install settings