Merge branch '117.156.67.61' of http://code.pacsonline.cn/zskk_bg/nginx_conf into 117.156.67.61

https.d/api.conf

@@ -0,0 +1,58 @@
+server {
+  listen       9600;
+  ssl on;
+  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/api/access.log;
+  error_log   /data/logs/nginx/api/error.log;
+  index	index.html index.php;
+  root /data/code/yuanchengpasc/public/;
+
+  #add_header Access-Control-Allow-Origin '*';
+  #add_header Access-Control-Allow-Headers 'X-Requested-With,Content-Type';
+  #add_header Access-Control-Allow-Methods 'GET,POST,OPTIONS'
+  location / {
+      if (!-e $request_filename) {
+        rewrite  ^/(.*)$  /index.php/$1  last;
+          break;
+      }
+  }
+
+	location  ~ \.(js|css|gif|jpg|jpeg|png|html)$ {
+        root /data/code/yuanchengpasc/public/;
+  }
+
+#	location /dist/ {
+#		root /data/gitcode/ychz/client/ris;
+#		index index.html;
+#	}
+
+	location ~  \.php {
+    include         fastcgi_params;
+    set  $script $uri;
+    set  $path_info "";
+    if ($uri ~ "^(.+\.php)(/.+)") {
+        set $script     $1;
+        set $path_info  $2;
+    }
+		fastcgi_read_timeout 120;
+		fastcgi_pass 127.0.0.1:9000;
+    # fastcgi_pass    unix:/usr/local/php/var/run/php-fpm.sock;
+    fastcgi_index index.php;
+		#fastcgi_index   index.php?IF_REWRITE=1;
+    fastcgi_param   PATH_INFO       $path_info;
+    fastcgi_param   SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    set $real_script_name $fastcgi_script_name;
+		if ($fastcgi_script_name ~ "^(.+?\.php)(/.+)$") {
+      set $real_script_name $1;
+      set $path_info $2;
+    }
+    fastcgi_param SCRIPT_NAME $real_script_name;
+    #fastcgi_param   SCRIPT_NAME     $script;
+    #include         fastcgi_params;
+  }
+}

https.d/dcm.conf

@@ -0,0 +1,35 @@
+server {
+	listen       9999;
+  access_log  /data/logs/nginx/dcm/access.log;
+  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 {
+      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;
+  }
+
+    location = /favicon.ico {
+        access_log    off;
+        log_not_found off;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    #if ($scheme ~ http) {
+    #    return https://$server_name$request_uri;
+    #}	
+}

https.d/html.conf

@@ -0,0 +1,7 @@
+server {
+  listen       9602;
+  access_log  /data/logs/nginx/html/access.log;
+  error_log   /data/logs/nginx/html/error.log;
+	index	index.html index.htm;
+	root /data/www/ris;
+}

https.d/pacsview.conf

@@ -0,0 +1,9 @@
+server {
+  listen       9603;
+  #client_header_buffer_size 16M;
+  #large_client_header_buffers 4 16M;
+  access_log  /data/logs/nginx/pacsview/access.log;
+  error_log   /data/logs/nginx/pacsview/error.log;
+	index	index.html index.htm;
+	root /data/www/pacsview;
+}

nginx.conf

@@ -20,5 +20,6 @@ http {
     client_max_body_size 200m;
     sendfile        	on;
     keepalive_timeout  	65;
-    include conf.d/*.conf;
+    # include http.d/*.conf;
+    include https.d/*.conf;
 }