Fix GeoIP lookup

noobient · Dec 22, 2022 · 86231c1 · 86231c1
1 parent d9b6f04
commit 86231c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/roles/install/tasks/steam.yml b/roles/install/tasks/steam.yml
@@ -31,6 +31,7 @@
       - "{% if ansible_os_family == 'RedHat' %}langpacks-en{% else %}language-pack-en{% endif %}"
       - sudo
       - rsync
+      - jq
 
 - name: Create main Steam directory
   file:

diff --git a/share/killinuxfloor b/share/killinuxfloor
@@ -306,7 +306,7 @@ function add_bans ()
 
 function add_geoip ()
 {
-    GEOIP_CITY=$(curl -s "http://geoiplookup.net/ip/$(curl -s https://ipecho.net/plain)" | grep -A1 'City:' | grep -v 'City:' | sed -E 's@.*<div.*>(.*)</div>@\1@' || true)
+    GEOIP_CITY=$(curl -s "https://api.geoiplookup.net/?query=$(curl -s https://ipecho.net/plain)&json=true" | jq -r '.city') # stupid mcedit syntax hilight "
 
     if [ ! -z "${GEOIP_CITY+x}" ] && [ "${#GEOIP_CITY}" -gt 0 ]
     then
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ @@
           - "{% if ansible_os_family == 'RedHat' %}langpacks-en{% else %}language-pack-en{% endif %}"
           - sudo
           - rsync
+          - jq
     - name: Create main Steam directory
       file:
@@ Expand Down @@