Real-world testing

posm · Nov 22, 2016 · ed2987f · ed2987f
1 parent 052ba5b
commit ed2987f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/kickstart/etc/dnsmasq-00proxy.conf b/kickstart/etc/dnsmasq-00proxy.conf
@@ -1,2 +1 @@
-dhcp-option=252,http://wpad.{{lan_domain}}/wpad.dat
-cname=wpad,{{posm_fqdn}}
+dhcp-option=252,"http://wpad.{{lan_domain}}/wpad.dat"
diff --git a/kickstart/etc/dnsmasq-posm.conf b/kickstart/etc/dnsmasq-posm.conf
@@ -89,7 +89,7 @@ dhcp-option=option:ntp-server,0.0.0.0
 #dhcp-option=46,8           # netbios node type
 
 # Send an empty WPAD option. This may be REQUIRED to get windows 7 to behave.
-dhcp-option=252,"\n"
+#dhcp-option=252,"\n"
 
 # Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
 # probably doesn't support this......

diff --git a/kickstart/etc/hosts b/kickstart/etc/hosts
@@ -1,5 +1,5 @@
 127.0.0.1       localhost
-{{posm_wlan_ip}}      {{posm_fqdn}} {{osm_fqdn}} {{posm_hostname}}.{{lan_domain}} {{posm_hostname}}
+{{posm_wlan_ip}}      {{posm_fqdn}} {{osm_fqdn}} {{posm_hostname}}.{{lan_domain}} {{posm_hostname}} wpan.{{lan_domain}} wpad
 ::1             localhost ip6-localhost ip6-loopback
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
diff --git a/kickstart/etc/nginx-posm.conf b/kickstart/etc/nginx-posm.conf
@@ -82,7 +82,7 @@ server {
   }
 
   location /wpad.dat {
-    return 200 'function FindProxyForURL(url, host) {\n  if (shExpMatch(host, "{{posm_fqdn}}")) {\n    return "DIRECT";\n  }\n\n  return "PROXY {{posm_wlan_ip}}:1080; DIRECT";\n}';
+    return 200 'function FindProxyForURL(url, host) {\n  if (shExpMatch(host.toLowerCase(), "*.{{posm_fqdn}}") || isInNet(dnsResolve(host), "{{posm_network}}.0.0",  "255.240.0.0")) {\n    return "DIRECT";\n  }\n\n  return "PROXY {{posm_wlan_ip}}:1080";\n}';
     add_header Content-Type application/x-ns-proxy-autoconfig;
   }
 }