1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 15:15:22 +00:00

Merge branch 'master' into master

This commit is contained in:
catborise 2018-07-18 15:09:50 +03:00 committed by GitHub
commit cd072e488b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

View file

@ -233,7 +233,7 @@ datasource:
sudo virtualenv venv sudo virtualenv venv
sudo source venv/bin/activate sudo source venv/bin/activate
git pull git pull
pip install -U -r requirements.txt pip install -U -r conf/requirements.txt
python manage.py migrate python manage.py migrate
sudo service supervisor restart sudo service supervisor restart
``` ```

View file

@ -1,5 +1,5 @@
Django==1.11.14 Django==1.11.14
websockify==0.8.0 websockify==0.8.0
gunicorn==19.9.0 gunicorn==19.9.0
libvirt-python==3.1.0 lxml==4.2.3
lxml==4.2.3 libvirt-python==4.4.0

View file

@ -83,7 +83,15 @@ TEMPLATES = [
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [ os.path.join(BASE_DIR, 'templates'), ], 'DIRS': [ os.path.join(BASE_DIR, 'templates'), ],
'APP_DIRS': True, 'APP_DIRS': True,
} 'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
] ]
## WebVirtCloud settings ## WebVirtCloud settings