fuyu 4 anni fa
parent
commit
2177855b40
3 ha cambiato i file con 32 aggiunte e 13 eliminazioni
  1. 4 4
      http.d/dcm.conf
  2. 7 1
      https.d/byc.conf
  3. 21 8
      https.d/dcm.conf

+ 4 - 4
http.d/dcm.conf

@@ -12,10 +12,10 @@ server {
   #ssl_prefer_server_ciphers on;
   #add_header 'Access-Control-Allow-Origin' 'http://127.0.0.1:3456';
   
-location / {
-root /data/www/byc;
-}
- location ~/group1/M00 {
+  location / {
+    root /data/www/byc;
+  }
+  location ~/group1/M00 {
       add_header 'Access-Control-Allow-Origin' '*';
       #add_header 'Access-Control-Allow-Origin' 'http://demo.pacsonline.cn';
       #add_header 'Access-Control-Allow-Origin' 'http://wechat.pacsonline.cn';

+ 7 - 1
https.d/byc.conf

@@ -1,5 +1,11 @@
 server {
-  listen       19600;
+  listen       19600 ssl;
+  ssl_certificate /data/ssl/tls.crt;
+  ssl_certificate_key /data/ssl/tls.key;
+  ssl_session_timeout 5m;
+  ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_prefer_server_ciphers on;
   access_log  /data/logs/nginx/byc/access.log;
   error_log   /data/logs/nginx/byc/error.log; 
   index	index.html index.htm;

+ 21 - 8
https.d/dcm.conf

@@ -10,19 +10,32 @@ server {
   error_log   /data/logs/nginx/dcm/error.log;
 	root html;
   index index.html index.htm;
-  #ssl_certificate     /data/sslkey/dcm/dcm.pem;
-  #ssl_certificate_key /data/sslkey/dcm/dcm.key;
-  #ssl_session_timeout 5m;
-  #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
-  #ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-  #ssl_prefer_server_ciphers on;
-  #add_header 'Access-Control-Allow-Origin' 'http://127.0.0.1:3456';
-  location ~/group[0-9]/M00 {
+  location / {
+    root /data/www/byc;
+  }
+  location ~/group1/M00 {
+      add_header 'Access-Control-Allow-Origin' '*';
+      #add_header 'Access-Control-Allow-Origin' 'http://demo.pacsonline.cn';
+      #add_header 'Access-Control-Allow-Origin' 'http://wechat.pacsonline.cn';
+      #add_header 'Access-Control-Allow-Origin' 'http://local.pacsonline.cn';
+      ngx_fastdfs_module;
+      root /z01/fastdfs_storage_data/data;
+  }
+location ~/group1/M01 {
+      add_header 'Access-Control-Allow-Origin' '*';
+      #add_header 'Access-Control-Allow-Origin' 'http://demo.pacsonline.cn';
+      #add_header 'Access-Control-Allow-Origin' 'http://wechat.pacsonline.cn';
+      #add_header 'Access-Control-Allow-Origin' 'http://local.pacsonline.cn';
+      ngx_fastdfs_module;
+      root /z02/fastdfs_storage_data/data;
+  }
+location ~/group1/M02 {
       add_header 'Access-Control-Allow-Origin' '*';
       #add_header 'Access-Control-Allow-Origin' 'http://demo.pacsonline.cn';
       #add_header 'Access-Control-Allow-Origin' 'http://wechat.pacsonline.cn';
       #add_header 'Access-Control-Allow-Origin' 'http://local.pacsonline.cn';
       ngx_fastdfs_module;
+      root /z03/fastdfs_storage_data/data;
   }
 
     location = /favicon.ico {