summaryrefslogtreecommitdiffhomepage
path: root/nginx/sites-available
diff options
context:
space:
mode:
Diffstat (limited to 'nginx/sites-available')
-rw-r--r--nginx/sites-available/vps27
1 files changed, 17 insertions, 10 deletions
diff --git a/nginx/sites-available/vps b/nginx/sites-available/vps
index 0892b88..b65f7f9 100644
--- a/nginx/sites-available/vps
+++ b/nginx/sites-available/vps
@@ -15,6 +15,11 @@ map $uri $basename {
15 ~/(?<captured_basename>[^/]*)$ $captured_basename; 15 ~/(?<captured_basename>[^/]*)$ $captured_basename;
16} 16}
17 17
18# charset
19charset utf-8;
20charset_types *;
21override_charset on;
22
18server { 23server {
19 server_name topo.tw www.topo.tw; 24 server_name topo.tw www.topo.tw;
20 25
@@ -32,17 +37,12 @@ server {
32 37
33 38
34 include /etc/nginx/sites-available/topo.tw.tmp; 39 include /etc/nginx/sites-available/topo.tw.tmp;
35 include /home/pham/site/nginx/modules/fancyindex/fancyindex.conf;
36 40
41 include /home/pham/site/nginx/modules/fancyindex/fancyindex.conf;
37 location ^~ /fancyindex/ { 42 location ^~ /fancyindex/ {
38 root /home/pham/site/nginx/modules; 43 root /home/pham/site/nginx/modules;
39 } 44 }
40 45
41 # charset
42 charset utf-8;
43 charset_types *;
44 override_charset on;
45
46 # header 46 # header
47 proxy_set_header Host $host; 47 proxy_set_header Host $host;
48 add_header Cache-Control "no-cache" always; 48 add_header Cache-Control "no-cache" always;
@@ -304,13 +304,20 @@ server {
304# services for OSM 304# services for OSM
305server { 305server {
306 server_name osm.topo.tw; 306 server_name osm.topo.tw;
307 listen 80;
308 root /srv/osm;
309}
307 310
311server {
312 server_name rb.topo.tw riverbien.topo.tw;
308 listen 80; 313 listen 80;
309 #listen 443 ssl; 314 root /srv/riverbien;
310 #ssl_certificate /etc/nginx/ssl/git.topo.tw/fullchain.cer;
311 #ssl_certificate_key /etc/nginx/ssl/git.topo.tw/git.topo.tw.key;
312 315
313 root /srv/osm; 316 include /home/pham/site/nginx/modules/fancyindex/fancyindex.conf;
317 fancyindex_default_sort date_desc;
318 location ^~ /fancyindex/ {
319 root /home/pham/site/nginx/modules;
320 }
314} 321}
315 322
316# git server 323# git server