From d028612d5593e45aee83e70ff02e1c9ce5f86a2e Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 6 Apr 2017 19:13:18 +0300 Subject: [PATCH] Minor script fixes --- scripts/autoinstall.sh | 4 ++-- webapp/management/commands/createdefaultadmin.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/autoinstall.sh b/scripts/autoinstall.sh index 7a5bcf6..6ca4d6d 100755 --- a/scripts/autoinstall.sh +++ b/scripts/autoinstall.sh @@ -14,7 +14,7 @@ then curl -fsSL https://get.docker.com/ | sh fi -systemctl status docker.service || { echo "Docker daemon is not running. Please start it!"; exit 1; } +systemctl status docker.service >/dev/null || { echo "Docker daemon is not running. Please start it!"; exit 1; } echo "Checking if docker-compose is installed..." docker-compose --version @@ -39,7 +39,7 @@ echo "Importing database settings..." docker-compose -p "$PROJECT" exec -T db sh /db/install.sh || { echo "Failed to import database settings!"; exit 1; } echo "Shutting down db container..." -docker-compose -p "$PROJECT" down db +docker-compose down db echo "Copying settings..." cp sikweb/settings-docker-sample.py sikweb/settings.py || { echo "Failed to copy settings!"; exit 1; } diff --git a/webapp/management/commands/createdefaultadmin.py b/webapp/management/commands/createdefaultadmin.py index e7cc682..d19c288 100644 --- a/webapp/management/commands/createdefaultadmin.py +++ b/webapp/management/commands/createdefaultadmin.py @@ -17,4 +17,4 @@ class Command(BaseCommand): u.is_staff = True u.save() - self.stdout.write("Created default user {} with password {}.".format(user_name, password)) + self.stdout.write("Created default user {} with password {}.".format(self.user_name, self.password))