dépôts
/
lhc
/
ateliers.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0804c01
)
Ajout : nginx : default_server .
author
Julien Moutinho
<julm+heureux-cyclage@autogeree.net>
Wed, 11 Sep 2013 10:17:48 +0000
(12:17 +0200)
committer
root
<root@ateliers.heureux-cyclage.org>
Wed, 11 Sep 2013 10:28:01 +0000
(12:28 +0200)
etc/nginx/nginx.conf
patch
|
blob
|
history
diff --git
a/etc/nginx/nginx.conf
b/etc/nginx/nginx.conf
index
f676f8e
..
25aa317
100644
(file)
--- a/
etc/nginx/nginx.conf
+++ b/
etc/nginx/nginx.conf
@@
-100,6
+100,19
@@
http {
}
include /etc/nginx/site.d/*/http.conf;
include /etc/nginx/site.d/*/server.conf;
}
include /etc/nginx/site.d/*/http.conf;
include /etc/nginx/site.d/*/server.conf;
+ server {
+ listen 80 default_server;
+ server_name _;
+ return 302 $scheme://heureux-cyclage.org$request_uri;
+ }
+ server {
+ listen 443 default_server;
+ server_name _;
+ include /etc/nginx/conf.d/ssl.conf;
+ ssl_certificate /etc/nginx/x509.d/cyclo-www-tls/crt.pem;
+ ssl_certificate_key /etc/nginx/x509.d/cyclo-www-tls/key.pem;
+ return 302 $scheme://cyclocoop.org$request_uri;
+ }
}
pid /run/nginx.pid;
user www-data;
}
pid /run/nginx.pid;
user www-data;