mirror of
https://github.com/retspen/webvirtcloud
synced 2025-01-12 08:25:18 +00:00
Merge branch 'master' of github.com:honza801/webvirtcloud
Conflicts: README.md computes/views.py gunicorn.conf.py instances/templates/instance.html instances/views.py vrtManager/create.py vrtManager/instance.py
This commit is contained in:
commit
cd787c3eaf
2 changed files with 8 additions and 3 deletions
10
README.md
10
README.md
|
@ -69,9 +69,9 @@ sudo git clone https://github.com/retspen/webvirtcloud && cd webvirtcloud
|
||||||
```
|
```
|
||||||
sudo virtualenv venv
|
sudo virtualenv venv
|
||||||
sudo source venv/bin/activate
|
sudo source venv/bin/activate
|
||||||
sudo pip install -r conf/requirements.txt
|
sudo venv/bin/pip install -r conf/requirements.txt
|
||||||
sudo cp conf/nginx/webvirtcloud.conf /etc/nginx/conf.d/
|
sudo cp conf/nginx/webvirtcloud.conf /etc/nginx/conf.d/
|
||||||
sudo python manage.py migrate
|
sudo venv/bin/python manage.py migrate
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Configure the supervisor for CentOS
|
#### Configure the supervisor for CentOS
|
||||||
|
@ -125,6 +125,10 @@ You will need to edit the main nginx.conf file as the one that comes from the rp
|
||||||
|
|
||||||
Also make sure file in **/etc/nginx/conf.d/webvirtcloud.conf** has the proper paths:
|
Also make sure file in **/etc/nginx/conf.d/webvirtcloud.conf** has the proper paths:
|
||||||
```
|
```
|
||||||
|
upstream gunicorn_server {
|
||||||
|
#server unix:/srv/webvirtcloud/venv/wvcloud.socket fail_timeout=0;
|
||||||
|
server 127.0.0.1:8000 fail_timeout=0;
|
||||||
|
}
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
|
|
||||||
|
@ -137,7 +141,7 @@ server {
|
||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:8000;
|
proxy_pass http://gunicorn_server;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header Host $host:$server_port;
|
proxy_set_header Host $host:$server_port;
|
||||||
|
|
|
@ -20,6 +20,7 @@ import os
|
||||||
# range.
|
# range.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#bind = 'unix:/srv/webvirtcloud/venv/wvcloud.socket'
|
||||||
bind = '127.0.0.1:8000'
|
bind = '127.0.0.1:8000'
|
||||||
backlog = 2048
|
backlog = 2048
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue