rename g3proxy-geoip to g3iploc-db

bytedance · May 9, 2024 · 6a61eb3 · 6a61eb3
1 parent d635d27
commit 6a61eb3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,13 +39,13 @@ members = [
     "g3bench",
     "g3fcgen",
     "g3iploc",
+    "g3iploc/utils/db",
     "g3mkcert",
     "g3proxy",
     "g3proxy/proto",
     "g3proxy/utils/ctl",
     "g3proxy/utils/ftp",
     "g3proxy/utils/lua",
-    "g3proxy/utils/geoip",
     "g3tiles",
     "g3tiles/proto",
     "g3tiles/utils/ctl",
@@ -61,12 +61,12 @@ default-members = [
     "g3bench",
     "g3fcgen",
     "g3iploc",
+    "g3iploc/utils/db",
     "g3mkcert",
     "g3proxy",
     "g3proxy/utils/ctl",
     "g3proxy/utils/ftp",
     "g3proxy/utils/lua",
-    "g3proxy/utils/geoip",
     "g3tiles",
     "g3tiles/utils/ctl",
     "g3keymess",

diff --git a/g3iploc/debian/g3iploc.install b/g3iploc/debian/g3iploc.install
@@ -1,2 +1,3 @@
 usr/bin/g3iploc
+usr/bin/g3iploc-db
 lib/systemd/system/
diff --git a/g3iploc/debian/rules b/g3iploc/debian/rules
@@ -14,11 +14,12 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	G3_PACKAGE_VERSION=$(DEB_VERSION) \
 	  cargo build --frozen --offline --profile $(BUILD_PROFILE) \
-	    --package g3iploc
+	    --package g3iploc --package g3iploc-db
 
 override_dh_auto_install:
 	dh_auto_install
 	install -m 755 -D target/$(BUILD_PROFILE)/g3iploc debian/tmp/usr/bin/g3iploc
+	install -m 755 -D target/$(BUILD_PROFILE)/g3iploc-db debian/tmp/usr/bin/g3iploc-db
 	install -m 644 -D $(PACKAGE_NAME)/service/[email protected] debian/tmp/lib/systemd/system/[email protected]
 
 override_dh_installchangelogs:

diff --git a/g3iploc/g3iploc.spec b/g3iploc/g3iploc.spec
@@ -28,17 +28,19 @@ IP Locate Service for G3 Project
 %build
 G3_PACKAGE_VERSION="%{version}-%{release}"
 export G3_PACKAGE_VERSION
-cargo build --frozen --offline --profile %{build_profile} --package g3iploc
+cargo build --frozen --offline --profile %{build_profile} --package g3iploc --package g3iploc-db
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -m 755 -D target/%{build_profile}/g3iploc %{buildroot}%{_bindir}/g3iploc
+install -m 755 -D target/%{build_profile}/g3iploc-db %{buildroot}%{_bindir}/g3iploc-db
 install -m 644 -D %{name}/service/[email protected] %{buildroot}/lib/systemd/system/[email protected]
 
 
 %files
 %{_bindir}/g3iploc
+%{_bindir}/g3iploc-db
 /lib/systemd/system/[email protected]
 %license LICENSE
 %license LICENSE-BUNDLED

diff --git a/g3proxy/utils/geoip/Cargo.toml → g3iploc/utils/db/Cargo.toml b/g3proxy/utils/geoip/Cargo.toml → g3iploc/utils/db/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "g3proxy-geoip"
+name = "g3iploc-db"
 version = "0.1.0"
 license.workspace = true
 edition.workspace = true

diff --git a/g3proxy/utils/geoip/src/main.rs → g3iploc/utils/db/src/main.rs b/g3proxy/utils/geoip/src/main.rs → g3iploc/utils/db/src/main.rs