Merge branch 'master' of ssh://willipink.eu:3456/moritz/coinmanager

This commit is contained in:
koksnuss 2020-05-19 10:06:24 +02:00
commit 9a1a060f49
4 changed files with 5 additions and 5 deletions

2
.gitignore vendored
View File

@ -4,5 +4,5 @@
Pipfile.lock
**/work_data/*
**/__pycache__/*
*.sqlite
*.sqlite3
coinmanager/static/*

View File

@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'coinmanager.settings_prod')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'coinmanager.production_settings')
application = get_wsgi_application()

6
update
View File

@ -1,11 +1,11 @@
#!/bin/bash
echo "cloning ..."
#git pull origin master
git pull origin master
echo "collecting static files ..."
cd /home/willipink/coinmanager/coinmanager
sudo -u willipink /home/willipink/.local/bin/pipenv run manage.py collectstatic --settings coinmanager.settings_prod
pipenv run python manage.py collectstatic --settings coinmanager.production_settings --no-input
echo "restarting apache ..."
#systemctl restart apache2
sudo systemctl restart apache2