Change naming and veriy test-scheduler function

[bottlenecks.git] / test-scheduler / ui / config / default.conf

diff --git a/testing-scheduler/ui/config/default.conf b/test-scheduler/ui/config/default.conf
similarity index 96%
rename from testing-scheduler/ui/config/default.conf
rename to test-scheduler/ui/config/default.conf
index be910b4..17f8ba4 100644 (file)
--- a/testing-scheduler/ui/config/default.conf
+++ b/test-scheduler/ui/config/default.conf
@@ -1,71 +1,71 @@
-server {\r
-    listen       5311;\r
-    server_name  localhost;\r
-\r
-    #charset koi8-r;\r
-    #access_log  /var/log/nginx/log/host.access.log  main;\r
-\r
-    location / {\r
-        root   /usr/share/nginx/html;\r
-        index  index.html index.htm;\r
-    }\r
-\r
-\r
-    #error_page  404              /404.html;\r
-\r
-    # redirect server error pages to the static page /50x.html\r
-    #\r
-    error_page   500 502 503 504  /50x.html;\r
-    location = /50x.html {\r
-        root   html;\r
-    }\r
-\r
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80\r
-    #\r
-    #location ~ \.php$ {\r
-    #    proxy_pass   http://127.0.0.1;\r
-    #}\r
-    location ^~/parser/ {\r
-         rewrite ^/parser/(.*)$ /$1 break;\r
-         proxy_set_header Host $host;\r
-         proxy_set_header x-forwarded-for $remote_addr;\r
-         proxy_set_header X-Real-IP       $remote_addr;\r
-         proxy_pass http://t-scheduler-server:5310;\r
-    }\r
-    location ^~/wf-graph/ {\r
-         rewrite ^/wf-graph/(.*)$ /$1 break;\r
-         proxy_set_header Host $host;\r
-         proxy_set_header x-forwarded-for $remote_addr;\r
-         proxy_set_header X-Real-IP       $remote_addr;\r
-         proxy_pass http://conductor_conductor-ui_1:5000;\r
-    }\r
-    location ^~/api/ {\r
-         proxy_set_header Host $host;\r
-         proxy_set_header x-forwarded-for $remote_addr;\r
-         proxy_set_header X-Real-IP       $remote_addr;\r
-         proxy_pass http://conductor_conductor-ui_1:5000;\r
-    }\r
-    location ^~/wf-server/ {\r
-         rewrite ^/wf-server/(.*)$ /$1 break;\r
-         proxy_set_header Host $host;\r
-         proxy_set_header x-forwarded-for $remote_addr;\r
-         proxy_set_header X-Real-IP       $remote_addr;\r
-         proxy_pass http://conductor_conductor-server_1:8080;\r
-    }\r
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000\r
-    #\r
-    #location ~ \.php$ {\r
-    #    root           html;\r
-    #    fastcgi_pass   127.0.0.1:9000;\r
-    #    fastcgi_index  index.php;\r
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;\r
-    #    include        fastcgi_params;\r
-    #}\r
-\r
-    # deny access to .htaccess files, if Apache's document root\r
-    # concurs with nginx's one\r
-    #\r
-    #location ~ /\.ht {\r
-    #    deny  all;\r
-    #}\r
-}\r
+server {
+    listen       5311;
+    server_name  localhost;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/log/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+    location ^~/parser/ {
+         rewrite ^/parser/(.*)$ /$1 break;
+         proxy_set_header Host $host;
+         proxy_set_header x-forwarded-for $remote_addr;
+         proxy_set_header X-Real-IP       $remote_addr;
+         proxy_pass http://t-scheduler-server:5310;
+    }
+    location ^~/wf-graph/ {
+         rewrite ^/wf-graph/(.*)$ /$1 break;
+         proxy_set_header Host $host;
+         proxy_set_header x-forwarded-for $remote_addr;
+         proxy_set_header X-Real-IP       $remote_addr;
+         proxy_pass http://conductor_conductor-ui_1:5000;
+    }
+    location ^~/api/ {
+         proxy_set_header Host $host;
+         proxy_set_header x-forwarded-for $remote_addr;
+         proxy_set_header X-Real-IP       $remote_addr;
+         proxy_pass http://conductor_conductor-ui_1:5000;
+    }
+    location ^~/wf-server/ {
+         rewrite ^/wf-server/(.*)$ /$1 break;
+         proxy_set_header Host $host;
+         proxy_set_header x-forwarded-for $remote_addr;
+         proxy_set_header X-Real-IP       $remote_addr;
+         proxy_pass http://conductor_conductor-server_1:8080;
+    }
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}