Merge branch 'master' into master

This commit is contained in:
Demian 2018-08-05 12:20:01 +02:00 committed by GitHub
commit 2aaf1ec18d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,7 +31,7 @@ fi
echo "💡 Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}"
./manage.py shell --plain << END
./manage.py shell --interface python << END
from django.contrib.auth.models import User
from users.models import Token
if not User.objects.filter(username='${SUPERUSER_NAME}'):
@ -41,7 +41,7 @@ END
for script in /opt/netbox/startup_scripts/*.py; do
echo "⚙️ Executing '$script'"
./manage.py shell --plain < "${script}"
./manage.py shell --interface python < "${script}"
done
# copy static files