Browse Source

http req improved

master
barry 6 years ago
parent
commit
421d99b0af
12 changed files with 3082 additions and 27 deletions
  1. 1
      src/portal-srv/index.js
  2. 16
      srv/conf/conf.d/portal.conf
  3. 1386
      srv/conf/dnsmasq.conf
  4. 20
      srv/conf/nginx.conf
  5. 0
      srv/webapp/default/generate_204
  6. 0
      srv/webapp/default/index.html
  7. 0
      srv/webapp/portal/index.html
  8. 1668
      srv/webapp/portal/js/axios/axios.js
  9. 1
      srv/webapp/portal/js/axios/axios.map
  10. 9
      srv/webapp/portal/js/axios/axios.min.js
  11. 1
      srv/webapp/portal/js/axios/axios.min.map
  12. 7
      srv/webapp/portal/ready.html

1
src/portal-srv/index.js

@ -77,6 +77,7 @@ app.use(function (req, res, next) {
function findMacAddress (pIp, pCallback) {
exec(CFG.arpCmd, function (pCode, pStdout) {
console.log(pCode, pStdout)
let lines = pStdout.split('\n')
if (!lines.length) {
return pCallback('NotFound')

16
srv/conf/conf.d/portal.conf

@ -5,27 +5,19 @@ server {
*.gstatic.com;
location / {
proxy_pass http://portal_service:8889/;
proxy_set_header Host $host;
proxy_pass http://portal_service:8889/;
proxy_set_header Host $host;
proxy_set_header X-Real-Ip $remote_addr;
proxy_buffering off;
}
proxy_buffering off;
}
}
server {
listen 80 default_server;
server_name _ eca.aero;
root /data/webapp/default;
}
#server {
# listen 80 default_server;
# listen 443 default_server;
# server_name _;
# return 302 http://eca.aero$request_uri;
#}
server {
server_name portal.eca.aero;
root /data/webapp/portal;

1386
srv/conf/dnsmasq.conf
File diff suppressed because it is too large
View File

20
srv/conf/nginx.conf

@ -6,27 +6,27 @@ pid /var/run/nginx.pid;
events {
worker_connections 1024;
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
keepalive_timeout 65;
#gzip on;
#gzip on;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/conf.d/*.conf;
}

src/portal-srv/webapp/default/generate_204 → srv/webapp/default/generate_204

src/portal-srv/webapp/default/index.html → srv/webapp/default/index.html

src/portal-srv/webapp/portal/index.html → srv/webapp/portal/index.html

1668
srv/webapp/portal/js/axios/axios.js
File diff suppressed because it is too large
View File

1
srv/webapp/portal/js/axios/axios.map
File diff suppressed because it is too large
View File

9
srv/webapp/portal/js/axios/axios.min.js
File diff suppressed because it is too large
View File

1
srv/webapp/portal/js/axios/axios.min.map
File diff suppressed because it is too large
View File

src/portal-srv/webapp/portal/ready.html → srv/webapp/portal/ready.html

@ -14,7 +14,12 @@
<script>
var xhttp = new XMLHttpRequest()
xhttp.onreadystatechange = function(event) {
if (this.readyState === XMLHttpRequest.DONE) {
console.log("Response: %d (%s)", this.status, this.statusText)
}
}
xhttp.open('GET', 'http://captive.eca.aero/validate')
xhttp.send()
xhttp.send(null)
</script>
Loading…
Cancel
Save