Merge pull request #110 from QingdaoU/https

add https helper

deploy/nginx/https_redirect.conf

@@ -0,0 +1,3 @@
+location / {
+    return 301 https://$host$request_uri;
+}

deploy/nginx/locations.conf

@@ -19,6 +19,10 @@ location /admin {
     try_files $uri $uri/ /index.html =404;
 }
 
+location /.well-known {
+    alias /data/ssl/.well-known;
+}
+
 location / {
     root /app/dist;
     try_files $uri $uri/ /index.html =404;

deploy/nginx/nginx.conf

@@ -36,7 +36,7 @@ http {
         listen 8000 default_server;
         server_name _;
 
-        include common.conf;
+        include http_locations.conf;
     }
 
     server {
@@ -49,7 +49,7 @@ http {
         ssl_prefer_server_ciphers on;
         ssl_session_cache shared:SSL:10m;
 
-        include common.conf;
+        include https_locations.conf;
     }
 
 }

deploy/run.sh

@@ -23,6 +23,14 @@ if [ ! -f "$SSL/server.key" ]; then
         -subj "/C=CN/ST=Beijing/L=Beijing/O=Beijing OnlineJudge Technology Co., Ltd./OU=Service Infrastructure Department/CN=`hostname`" -nodes
 fi
 
+cd $APP/deploy/nginx
+ln -sf locations.conf https_locations.conf
+if [ -z "$FORCE_HTTPS" ]; then
+    ln -sf locations.conf http_locations.conf
+else
+    ln -sf https_redirect.conf http_locations.conf
+fi
+
 cd $APP
 
 n=0