From 9d545788da8fee954d561c561e6ae3adecabb129 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Wed, 2 Dec 2015 02:42:25 +0300 Subject: [PATCH] move config templates to extra --- extra/nginx.conf | 23 ++++++++++++ extra/nginx_ssl.conf | 35 +++++++++++++++++++ .../settings.origin.ini | 0 extra/supervisor.conf | 19 ++++++++++ uwsgi.origin.ini => extra/uwsgi.ini | 6 ++-- 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 extra/nginx.conf create mode 100644 extra/nginx_ssl.conf rename settings.origin.ini => extra/settings.origin.ini (100%) create mode 100644 extra/supervisor.conf rename uwsgi.origin.ini => extra/uwsgi.ini (60%) diff --git a/extra/nginx.conf b/extra/nginx.conf new file mode 100644 index 0000000..a1adefe --- /dev/null +++ b/extra/nginx.conf @@ -0,0 +1,23 @@ +server { + listen 80; + server_name gocloud.ru www.gocloud.ru; + + access_log /var/log/nginx/gocloud.ru_access.log; + error_log /var/log/nginx/gocloud.ru_error.log; + rewrite_log on; + + index index.html; + + location / { + #proxy_pass http://127.0.0.1:5001; + include uwsgi_params; + uwsgi_pass unix:/var/run/gocloudru_control.sock; + } + + location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|bmp)$ { + root /var/lib/gocloud.ru/control; + access_log off; + expires 10d; + break; + } +} diff --git a/extra/nginx_ssl.conf b/extra/nginx_ssl.conf new file mode 100644 index 0000000..6c94e8b --- /dev/null +++ b/extra/nginx_ssl.conf @@ -0,0 +1,35 @@ +server { + listen 80; + server_name gocloud.ru www.gocloud.ru; + rewrite ^(.*)$ https://$server_name$1 permanent; +} + +server { + listen 443 ssl; + server_name gocloud.ru www.gocloud.ru; + + access_log /var/log/nginx/gocloud.ru_access.log; + error_log /var/log/nginx/gocloud.ru_error.log; + + ssl on; + ssl_certificate /var/lib/gocloud.ru/control/ssl/1_gocloud.ru_bundle.crt; + ssl_certificate_key /var/lib/gocloud.ru/control/ssl/2_gocloud.ru.key; + + ssl_protocols SSLv2 SSLv3 TLSv1; + ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP; + ssl_prefer_server_ciphers on; + + root /var/lib/gocloud.ru/control; + + location / { + #proxy_pass http://127.0.0.1:5001; + include uwsgi_params; + uwsgi_pass unix:/var/run/gocloudru_control.sock; + } + + location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|bmp)$ { + access_log off; + expires 10d; + break; + } +} diff --git a/settings.origin.ini b/extra/settings.origin.ini similarity index 100% rename from settings.origin.ini rename to extra/settings.origin.ini diff --git a/extra/supervisor.conf b/extra/supervisor.conf new file mode 100644 index 0000000..b86a46a --- /dev/null +++ b/extra/supervisor.conf @@ -0,0 +1,19 @@ +[program:gocloudru_control] +directory=/var/lib/gocloud.ru/control +autostart=true +autorestart=true +startsecs=1 +startretries=777 +exitcodes=0,2 +stopsignal=TERM +stopwaitsecs=1 +user=root +group=root +command=python uwsgi.py +environment=PATH="/var/env/gocloud.ru/bin" +#stdout_logfile=/var/log/procdnru_control.log +stdout_logfile_maxbytes=5MB +stdout_logfile_backups=5 +#stderr_logfile=/var/log/procdnru_control_errors.log +stderr_logfile_maxbytes=5MB +stderr_logfile_backups=2 diff --git a/uwsgi.origin.ini b/extra/uwsgi.ini similarity index 60% rename from uwsgi.origin.ini rename to extra/uwsgi.ini index d01e3ce..e00cee5 100644 --- a/uwsgi.origin.ini +++ b/extra/uwsgi.ini @@ -1,14 +1,14 @@ [uwsgi] ;virtualenv -;virtualenv = /var/env/gocloud.ru/ -virtualenv=/home/vanzhiganov/env/gocloud_server/ +virtualenv = /var/env/gocloud.ru/ +;virtualenv=/home/vanzhiganov/env/gocloud_server/ ;for http ;protocol = http ;socket = 127.0.0.1:8080 ; for unix-socket -socket = /tmp/procdnru_server.sock +socket = /var/run/procdnru_control.sock chmod-socket = 770 module = app:app