Commit 3700399a authored by Yuanle Song's avatar Yuanle Song
Browse files

v0.9.3 update dir conventions in config files 

use /var/log for log files.
use /etc/nginx/conf.d/ for site files.
parent f5fe945f

project.clj

+1 −1
Original line number Diff line number Diff line 
(defproject python/lein-template "0.9.2"

(defproject python/lein-template "0.9.3"

  :description "lein template for a python project"

  :repositories [["snapshots"

                  {:url "http://devserv.game.yy.com/nexus/content/repositories/snapshots"

src/leiningen/new/python/conf/http.site

+11 −8
Original line number Diff line number Diff line 
server {

    listen 80;

    server_name {{name}}.yyclouds.com;

    server_name {{name}};



    access_log /var/log/nginx/{{name}}.log main;

    error_log /var/log/nginx/{{name}}.err warn;



    access_log /data2/log/nginx/{{name}}.log main;

    error_log /data2/log/nginx/{{name}}.err error;

    ssi on;

    charset utf-8;

    client_max_body_size 30m;

    client_header_buffer_size 16k;

    large_client_header_buffers 16 64k;



    root /usr/local/nginx/html;

    server_tokens off;



    error_page 500 502 503 504 /50x.html;

    location = /50x.html {

        root /usr/local/nginx/html;

        root   /usr/share/nginx/html;

    }



    root /usr/share/nginx/html;



    gzip on;

    gzip_disable "msie6";

    # text/html is built-in.

    gzip_types text/plain application/xml text/xml application/x-rss+xml application/xhtml+xml text/css application/javascript application/x-javascript application/json;

    gzip_comp_level 3;
@@ -26,9 +27,11 @@ server { 
    gzip_vary on;



    # allow 127.0.0.1;

    # allow 113.106.251.80/29;

    # deny all;



    location /static/ {

    }



    location / {

        include uwsgi_params;

        uwsgi_pass 127.0.0.1:8082;

src/leiningen/new/python/conf/https.site

+16 −9
Original line number Diff line number Diff line 
server {

    listen 80;

    server_name {{name}}.yyclouds.com;

    server_name {{name}};

    server_tokens off;

    return 301 https://$host$request_uri;

}



server {

    server_name {{name}}.yyclouds.com;

    server_name {{name}};



    listen 443 ssl;

    ssl_certificate /opt/{{name}}/conf/yyclouds.com.crt;

    ssl_certificate_key /opt/{{name}}/conf/yyclouds.com.key;

    # cert and key should have owner root:ssl-cert, mode 640.

    ssl_certificate /etc/ssl/private/{{name}}.crt;

    ssl_certificate_key /etc/ssl/private/{{name}}.key;



    ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;

    ssl_ciphers RC4:HIGH:!aNULL:!MD5;
@@ -17,18 +19,24 @@ server { 
    ssl_session_cache shared:SSL:10m;

    ssl_session_timeout 10m;



    access_log /data2/log/nginx/{{name}}.log main;

    error_log /data2/log/nginx/{{name}}.err error;

    access_log /var/log/nginx/{{name}}.log main;

    error_log /var/log/nginx/{{name}}.err warn;



    ssi on;

    charset utf-8;

    client_max_body_size 30m;

    client_header_buffer_size 16k;

    large_client_header_buffers 16 64k;

    server_tokens off;



    error_page 500 502 503 504 /50x.html;

    location = /50x.html {

        root   /usr/share/nginx/html;

    }



    root /var/www;

    root /usr/share/nginx/html;



    gzip on;

    gzip_disable "msie6";

    # text/html is built-in.

    gzip_types text/plain application/xml text/xml application/x-rss+xml application/xhtml+xml text/css application/javascript application/x-javascript application/json;

    gzip_comp_level 3;
@@ -36,7 +44,6 @@ server { 
    gzip_vary on;



    # allow 127.0.0.1;

    # allow 113.106.251.80/29;

    # deny all;



    location /static/ {

src/leiningen/new/python/conf/logrotate.conf

+1 −1
Original line number Diff line number Diff line 
/data2/log/{{name}}/*.log {

/var/log/{{name}}/*.log {

    rotate 50

    weekly

    copytruncate

src/leiningen/new/python/conf/uwsgi.ini

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ gid=www-data 
pidfile=/tmp/{{name}}.pid

# double % is required for this to work.

log-date=%%a, %%d %%b %%Y %%T %%z

logto=/data2/log/{{name}}/uwsgi.log

touch-logreopen=/data2/log/{{name}}/uwsgi.touch

logto=/var/log/{{name}}/uwsgi.log

touch-logreopen=/var/log/{{name}}/uwsgi.touch



buffer-size=32768