Merge branch 'master' of ssh://willipink.eu:3456/moritz/coinmanager
This commit is contained in:
commit
9a1a060f49
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,5 +4,5 @@
|
|||||||
Pipfile.lock
|
Pipfile.lock
|
||||||
**/work_data/*
|
**/work_data/*
|
||||||
**/__pycache__/*
|
**/__pycache__/*
|
||||||
*.sqlite
|
*.sqlite3
|
||||||
coinmanager/static/*
|
coinmanager/static/*
|
||||||
|
@ -11,6 +11,6 @@ import os
|
|||||||
|
|
||||||
from django.core.wsgi import get_wsgi_application
|
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()
|
application = get_wsgi_application()
|
||||||
|
6
update
6
update
@ -1,11 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo "cloning ..."
|
echo "cloning ..."
|
||||||
#git pull origin master
|
git pull origin master
|
||||||
|
|
||||||
echo "collecting static files ..."
|
echo "collecting static files ..."
|
||||||
cd /home/willipink/coinmanager/coinmanager
|
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 ..."
|
echo "restarting apache ..."
|
||||||
#systemctl restart apache2
|
sudo systemctl restart apache2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user