Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

Simplified nginx conf. Redirect .org to .de

Browse source
This commit is contained in:
Martin Mahner 2014-12-12 19:06:29 +00:00
parent b1e82903ac
commit 39e687dbce
4 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/logrotate.conf
View file

@ -1,6 +1,7 @@
/srv/dpaste.de/var/*.log { /srv/dpaste.de/var/*.log {
daily monthly
rotate 7 rotate 52
missingok dateext
missingok
compress compress
} }

76
server/nginx.conf
View file

@ -2,18 +2,17 @@ upstream app_server {
server 127.0.0.1:12000 fail_timeout=0; server 127.0.0.1:12000 fail_timeout=0;
} }
# Combined log with remote:local port logged
log_format combined_port '$remote_addr - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent" "$remote_port:$server_port"';
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Redirect all sort of non-ssl (with and without www) to ssl without www # Redirect all sort of non-ssl (with and without www) to ssl without www
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
server { server {
listen 80; listen 80;
server_name dpaste.de www.dpaste.de dpaste.org www.dpaste.org; server_name ~(www\.)?dpaste\.(de|org);
# Do not redirect to SSL for API calls (some clients dont support
# this automatically)
location /api {
include /srv/dpaste.de/src/dpaste/server/nginx_server_appforward.conf;
}
location / { location / {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
@ -23,39 +22,62 @@ server {
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# SSL Hosts # SSL Hosts
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
server { server {
listen 443; listen 443 ssl;
server_name dpaste.org www.dpaste.org;
ssl_certificate /srv/dpaste.de/var/ssl/dpaste_org_unified.crt;
ssl_certificate_key /srv/dpaste.de/var/ssl/dpaste_org.key;
add_header Strict-Transport-Security max-age=25200;
# Redirect to dpaste.de
location / {
rewrite ^/(.*)$ https://dpaste.de/$1 permanent;
}
}
server {
listen 443 ssl;
server_name dpaste.de www.dpaste.de; server_name dpaste.de www.dpaste.de;
ssl on;
ssl_certificate /srv/dpaste.de/var/ssl/dpaste_de_unified.crt; ssl_certificate /srv/dpaste.de/var/ssl/dpaste_de_unified.crt;
ssl_certificate_key /srv/dpaste.de/var/ssl/dpaste_de.key; ssl_certificate_key /srv/dpaste.de/var/ssl/dpaste_de.key;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers AES256+EECDH:AES256+EDH;
ssl_session_cache builtin:1000 shared:SSL:5m;
ssl_prefer_server_ciphers on;
add_header Strict-Transport-Security max-age=25200;
# Rewrite www to non-www # Rewrite www to non-www
if ($host = www.dpaste.de) { if ($host = www.dpaste.de) {
rewrite ^/(.*)$ https://dpaste.de/$1 permanent; rewrite ^/(.*)$ https://dpaste.de/$1 permanent;
} }
add_header Strict-Transport-Security max-age=25200; access_log /srv/dpaste.de/var/nginx.access.log combined_port;
error_log /srv/dpaste.de/var/nginx.error.log;
include /srv/dpaste.de/src/dpaste/server/nginx_server.conf; keepalive_timeout 5;
} client_max_body_size 4G;
server { location /media/ {
listen 443; alias /srv/dpaste.de/var/media/;
server_name dpaste.org www.dpaste.org;
ssl on;
ssl_certificate /srv/dpaste.de/var/ssl/dpaste_org_unified.crt;
ssl_certificate_key /srv/dpaste.de/var/ssl/dpaste_org.key;
add_header Strict-Transport-Security max-age=25200;
# Rewrite www to non-www
if ($host = www.dpaste.org) {
rewrite ^/(.*)$ https://dpaste.org/$1 permanent;
} }
include /srv/dpaste.de/src/dpaste/server/nginx_server.conf; location /static/ {
alias /srv/dpaste.de/var/static/;
}
location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
if (!-f $request_filename) {
proxy_pass http://app_server;
break;
}
}
} }

15
server/nginx_server.conf
View file

@ -1,15 +0,0 @@
error_log /srv/dpaste.de/var/nginx.error.log;
keepalive_timeout 5;
client_max_body_size 4G;
location /media/ {
alias /srv/dpaste.de/var/media/;
}
location /static/ {
alias /srv/dpaste.de/var/static/;
}
location / {
include /srv/dpaste.de/src/dpaste/server/nginx_server_appforward.conf;
}

8
server/nginx_server_appforward.conf
View file

@ -1,8 +0,0 @@
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_buffering off;
if (!-f $request_filename) {
proxy_pass http://app_server;
break;
}