summaryrefslogtreecommitdiffhomepage
path: root/nginx
diff options
context:
space:
mode:
Diffstat (limited to 'nginx')
-rw-r--r--nginx/Makefile1
-rw-r--r--nginx/sites-available/vps15
2 files changed, 15 insertions, 1 deletions
diff --git a/nginx/Makefile b/nginx/Makefile
index a5697ef..8245ae7 100644
--- a/nginx/Makefile
+++ b/nginx/Makefile
@@ -9,6 +9,7 @@ all: src /home/pham/git/ngx-fancyindex
9 --prefix=/etc/nginx \ 9 --prefix=/etc/nginx \
10 --sbin-path=/usr/bin/nginx \ 10 --sbin-path=/usr/bin/nginx \
11 --conf-path=/etc/nginx/nginx.conf \ 11 --conf-path=/etc/nginx/nginx.conf \
12 --pid-path=/run/nginx.pid \
12 --with-http_ssl_module \ 13 --with-http_ssl_module \
13 --with-http_dav_module \ 14 --with-http_dav_module \
14 --with-http_image_filter_module \ 15 --with-http_image_filter_module \
diff --git a/nginx/sites-available/vps b/nginx/sites-available/vps
index c5a2fb9..0892b88 100644
--- a/nginx/sites-available/vps
+++ b/nginx/sites-available/vps
@@ -205,7 +205,8 @@ server {
205 } 205 }
206 206
207 location ^~ /osm { 207 location ^~ /osm {
208 alias /home/pham/public/osm/; 208 #alias /home/pham/public/osm/;
209 alias /srv/osm/dist/;
209 autoindex on; 210 autoindex on;
210 } 211 }
211 212
@@ -300,6 +301,18 @@ server {
300 #} 301 #}
301} 302}
302 303
304# services for OSM
305server {
306 server_name osm.topo.tw;
307
308 listen 80;
309 #listen 443 ssl;
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
313 root /srv/osm;
314}
315
303# git server 316# git server
304server { 317server {
305 server_name git.topo.tw; 318 server_name git.topo.tw;