Skip to content

Commit 2e007b5

Browse files
refactor(geoip): reconcile geoip system (#31)
1 parent 5d047b2 commit 2e007b5

File tree

86 files changed

+974
-2640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+974
-2640
lines changed

.github/workflows/deploy-api.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ jobs:
231231
CLAMAV_HOST=clamav
232232
CLAMAV_PORT=3310
233233
234-
GEOIP_HOST=fluxer-geoip_app:8080
235-
GEOIP_PROVIDER=maxmind
236234
MAXMIND_DB_PATH=/data/GeoLite2-City.mmdb
237235
238236
VAPID_PUBLIC_KEY=BEIwQxIwfj6m90tLYAR0AU_GJWU4kw8J_zJcHQG55NCUWSyRy-dzMOgvxk8yEDwdVyJZa6xUL4fmwngijq8T2pY

.github/workflows/deploy-geoip.yaml

Lines changed: 0 additions & 124 deletions
This file was deleted.

.github/workflows/deploy-marketing.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ jobs:
160160
- FLUXER_MARKETING_ENDPOINT=${MARKETING_ENDPOINT}
161161
- FLUXER_MARKETING_PORT=8080
162162
- FLUXER_PATH_MARKETING=/
163-
- GEOIP_HOST=fluxer-geoip_app:8080
164163
- RELEASE_CHANNEL=${RELEASE_CHANNEL}
165164
- FLUXER_METRICS_HOST=fluxer-metrics_app:8080
166165
deploy:

.github/workflows/update-geoip-db.yaml

Lines changed: 0 additions & 81 deletions
This file was deleted.

dev/.env.example

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ FLUXER_GATEWAY_RPC_PORT=8081
1818
FLUXER_MEDIA_PROXY_PORT=8080
1919
FLUXER_ADMIN_PORT=8080
2020
FLUXER_MARKETING_PORT=8080
21-
FLUXER_GEOIP_PORT=8080
22-
GEOIP_HOST=geoip:8080
2321

2422
FLUXER_PATH_GATEWAY=/gateway
2523
FLUXER_PATH_ADMIN=/admin
@@ -152,7 +150,6 @@ CLAMAV_PORT=3310
152150

153151
TENOR_API_KEY=
154152
YOUTUBE_API_KEY=
155-
IPINFO_TOKEN=
156153

157154
SECRET_KEY_BASE=
158155
GATEWAY_RPC_SECRET=

dev/Caddyfile.dev

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
reverse_proxy admin:8080
2929
}
3030

31-
@geoip path /geoip/*
32-
handle @geoip {
33-
handle_path /geoip/* {
34-
reverse_proxy geoip:8080
35-
}
36-
}
37-
3831
@marketing path /marketing /marketing/*
3932
handle @marketing {
4033
uri strip_prefix /marketing

dev/compose.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,6 @@ services:
145145
- fluxer-shared
146146
restart: on-failure
147147

148-
geoip:
149-
image: golang:1.25.5
150-
working_dir: /workspace
151-
command: bash -c "mkdir -p /data && if [ ! -f /data/ipinfo_lite.mmdb ] && [ -n \"$$IPINFO_TOKEN\" ]; then echo 'Downloading GeoIP database...'; curl -fsSL -o /data/ipinfo_lite.mmdb \"https://ipinfo.io/data/ipinfo_lite.mmdb?token=$$IPINFO_TOKEN\" && echo 'GeoIP database downloaded'; fi && go run ."
152-
env_file:
153-
- ./.env
154-
volumes:
155-
- ../fluxer_geoip:/workspace
156-
- ./geoip_data:/data
157-
networks:
158-
- fluxer-shared
159-
restart: on-failure
160-
161148
gateway:
162149
image: erlang:28-slim
163150
working_dir: /workspace

dev/main.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)