about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--tools/conf/etc/nginx/sites-enabled/default.conf4
-rw-r--r--tools/conf/etc/nginx/sites-enabled/shop.conf (renamed from tools/conf/etc/nginx/sites-enabled/shop.c2.ank.conf)6
-rw-r--r--tools/conf/etc/nginx/sites-enabled/task.conf (renamed from tools/conf/etc/nginx/sites-enabled/task.c2.ank.conf)2
3 files changed, 7 insertions, 5 deletions
diff --git a/tools/conf/etc/nginx/sites-enabled/default.conf b/tools/conf/etc/nginx/sites-enabled/default.conf
index 4bf7fa7..f7a6928 100644
--- a/tools/conf/etc/nginx/sites-enabled/default.conf
+++ b/tools/conf/etc/nginx/sites-enabled/default.conf
@@ -32,9 +32,9 @@ server {
 
 #proxy_redirect off;
 #proxy_set_header Host $http_host;
-#proxy_set_header X-Forwarded-Host $http_host;
+proxy_set_header X-Forwarded-Host $http_host;
 #proxy_set_header X-Real-IP $remote_addr;
-#proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
 
    location /doc {
diff --git a/tools/conf/etc/nginx/sites-enabled/shop.c2.ank.conf b/tools/conf/etc/nginx/sites-enabled/shop.conf
index 3a0aea1..de34e40 100644
--- a/tools/conf/etc/nginx/sites-enabled/shop.c2.ank.conf
+++ b/tools/conf/etc/nginx/sites-enabled/shop.conf
@@ -1,7 +1,9 @@
 server {
     listen 8080;
-    server_name shop.c2.ank;
+    server_name shop.server.ank;
 
+    access_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_shop,nohostname main;
+    error_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_shop_err,nohostname debug;
 
     location ~ ^/shop/admin {
         alias /srv/www/shop/upload/admin;
@@ -63,7 +65,7 @@ server {
     }
    
 
-location @tribushop {
+    location @tribushop {
         rewrite ^/shop/(.+)$ /shop/index.php?_route_=$1 last;
     }
 
diff --git a/tools/conf/etc/nginx/sites-enabled/task.c2.ank.conf b/tools/conf/etc/nginx/sites-enabled/task.conf
index 2d62e96..8b15ee5 100644
--- a/tools/conf/etc/nginx/sites-enabled/task.c2.ank.conf
+++ b/tools/conf/etc/nginx/sites-enabled/task.conf
@@ -1,6 +1,6 @@
 server {
     listen 8080;
-    server_name task.c2.ank;
+    server_name task.server.ank;
 
     location /task {
         index index.php;
ral.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
#!/bin/sh
# Run SubX VM, first compiling if necessary.
set -e

./build  &&  ./bootstrap_bin "$@"