summaryrefslogtreecommitdiff |
diff options
author | nsensfel <SpamShield0@noot-noot.org> | 2017-11-06 17:01:08 +0100 |
---|---|---|
committer | nsensfel <SpamShield0@noot-noot.org> | 2017-11-06 17:01:08 +0100 |
commit | 8185173f97cba8228fdf0b7d8bd8341e188176d9 (patch) | |
tree | ed7cd42ecbc85e43dc635012bdec11ef993a12da | |
parent | 87fd9b3f1c9ad877bd487ddd3375377ae965e75a (diff) |
Got it to talk with the server!
-rw-r--r-- | conf/nginx.conf | 80 | ||||
-rw-r--r-- | src/battlemap/src/Constants/IO.elm | 8 | ||||
-rw-r--r-- | src/battlemap/src/Send/CharacterTurn.elm | 2 |
3 files changed, 87 insertions, 3 deletions
diff --git a/conf/nginx.conf b/conf/nginx.conf new file mode 100644 index 0000000..9fcfb0b --- /dev/null +++ b/conf/nginx.conf @@ -0,0 +1,80 @@ +user nsensfel nsensfel; +worker_processes 1; + +error_log /var/log/nginx/error_log info; + +events { + worker_connections 1024; + use epoll; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main + '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $bytes_sent ' + '"$http_referer" "$http_user_agent" ' + '"$gzip_ratio"'; + + client_header_timeout 10m; + client_body_timeout 10m; + send_timeout 10m; + + connection_pool_size 256; + client_header_buffer_size 1k; + large_client_header_buffers 4 2k; + request_pool_size 4k; + + gzip off; + + output_buffers 1 32k; + postpone_output 1460; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + + keepalive_timeout 75 20; + + ignore_invalid_headers on; + + index index.html; + + server { + listen 127.0.0.1; + server_name localhost; + + access_log /var/log/nginx/localhost.access_log main; + error_log /var/log/nginx/localhost.error_log info; + + root /my/src/tacticians-client/www/; + + location / { + autoindex on; + autoindex_exact_size off; + } + + location /handler/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_pass http://127.0.0.1:8000; + } + } + +# SSL example +#server { +# listen 127.0.0.1:443; +# server_name localhost; + +# ssl on; +# ssl_certificate /etc/ssl/nginx/nginx.pem; +# ssl_certificate_key /etc/ssl/nginx/nginx.key; + +# access_log /var/log/nginx/localhost.ssl_access_log main; +# error_log /var/log/nginx/localhost.ssl_error_log info; + +# root /var/www/localhost/htdocs; +#} +} diff --git a/src/battlemap/src/Constants/IO.elm b/src/battlemap/src/Constants/IO.elm index c6f3e48..bbd1dfd 100644 --- a/src/battlemap/src/Constants/IO.elm +++ b/src/battlemap/src/Constants/IO.elm @@ -1,7 +1,11 @@ module Constants.IO exposing (..) base_url : String -base_url = "https://tacticians.online" +--base_url = "https://tacticians.online" +base_url = "http://127.0.0.1" battlemap_handler_url : String -battlemap_handler_url = (base_url ++ "/handler/battlemap/") +battlemap_handler_url = (base_url ++ "/handler/battlemap") + +character_turn_handler : String +character_turn_handler = (battlemap_handler_url ++ "/character_turn.yaws") diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm index daadf4b..750c9e8 100644 --- a/src/battlemap/src/Send/CharacterTurn.elm +++ b/src/battlemap/src/Send/CharacterTurn.elm @@ -96,7 +96,7 @@ try_sending model = (Http.send Event.ServerReplied (Http.post - Constants.IO.battlemap_handler_url + Constants.IO.character_turn_handler (Http.jsonBody serial) (decode) ) |