Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Mahner 2013-07-19 09:54:25 +02:00
commit 02f067805b

View file

@ -25,7 +25,7 @@ server {
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
server { server {
listen 443; listen 443;
server_name dpaste.de; server_name dpaste.de www.dpaste.de;
ssl on; ssl on;
ssl_certificate /srv/dpaste.de/var/ssl/dpaste_de_unified.crt; ssl_certificate /srv/dpaste.de/var/ssl/dpaste_de_unified.crt;
@ -44,7 +44,7 @@ server {
server { server {
listen 443; listen 443;
server_name dpaste.org; server_name dpaste.org www.dpaste.org;
ssl on; ssl on;
ssl_certificate /srv/dpaste.de/var/ssl/dpaste_org_unified.crt; ssl_certificate /srv/dpaste.de/var/ssl/dpaste_org_unified.crt;