Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pkg #509

Merged
merged 2 commits into from
Jan 20, 2025
+78 −22
Merged

Update pkg #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c459e
update packages
zh-jq-b Jan 20, 2025
1b07424
always use latest systemd service file in deb package
zh-jq-b Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion g3bench/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
2 changes: 1 addition & 1 deletion g3fcgen/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
2 changes: 1 addition & 1 deletion g3iploc/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
2 changes: 1 addition & 1 deletion g3keymess/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
1 change: 0 additions & 1 deletion g3keymess/debian/g3keymess.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
usr/bin/g3keymess
usr/bin/g3keymess-ctl
lib/systemd/system/
21 changes: 21 additions & 0 deletions g3keymess/debian/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[Unit]
Description=G3 Keyless Server %i
After=syslog.target network-online.target
Wants=network-online.target

[Service]
Type=simple
RuntimeDirectory=g3keymess
RuntimeDirectoryPreserve=yes
EnvironmentFile=-/etc/g3keymess/%i/env
ExecStart=/usr/bin/g3keymess -c /etc/g3keymess/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=-/usr/bin/g3keymess-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline
KillMode=none
Restart=on-success
SuccessExitStatus=SIGQUIT
TimeoutStartSec=10
LimitNOFILE=10485760

[Install]
WantedBy=multi-user.target
2 changes: 0 additions & 2 deletions g3keymess/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ override_dh_auto_build:
cargo build --frozen --offline --profile $(BUILD_PROFILE) \
--no-default-features --features $(SSL_FEATURE), \
--package g3keymess --package g3keymess-ctl
sh $(PACKAGE_NAME)/service/generate_systemd.sh

override_dh_auto_install:
dh_auto_install
install -m 755 -D target/$(BUILD_PROFILE)/g3keymess debian/tmp/usr/bin/g3keymess
install -m 755 -D target/$(BUILD_PROFILE)/g3keymess-ctl debian/tmp/usr/bin/g3keymess-ctl
install -m 644 -D $(PACKAGE_NAME)/service/[email protected] debian/tmp/lib/systemd/system/[email protected]

override_dh_installchangelogs:
dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG
Expand Down
2 changes: 1 addition & 1 deletion g3mkcert/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
2 changes: 1 addition & 1 deletion g3proxy/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
1 change: 0 additions & 1 deletion g3proxy/debian/g3proxy.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ usr/bin/g3proxy
usr/bin/g3proxy-ctl
usr/bin/g3proxy-ftp
usr/bin/g3proxy-lua
lib/systemd/system/
22 changes: 22 additions & 0 deletions g3proxy/debian/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[Unit]
Description=G3 Proxy %i
After=syslog.target network-online.target
Wants=network-online.target

[Service]
Type=simple
RuntimeDirectory=g3proxy
RuntimeDirectoryPreserve=yes
EnvironmentFile=-/etc/g3proxy/%i/env
ExecStart=/usr/bin/g3proxy -c /etc/g3proxy/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/g3proxy-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline
KillMode=none
Restart=on-failure
SuccessExitStatus=SIGQUIT
RestartPreventExitStatus=255
TimeoutStartSec=10
LimitNOFILE=10485760

[Install]
WantedBy=multi-user.target
2 changes: 0 additions & 2 deletions g3proxy/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ override_dh_auto_build:
--no-default-features --features $(LUA_FEATURE),$(SSL_FEATURE),rustls-ring,quic,$(CARES_FEATURE),hickory \
--package g3proxy --package g3proxy-ctl --package g3proxy-lua
cargo build --frozen --profile $(BUILD_PROFILE) --package g3proxy-ftp
sh $(PACKAGE_NAME)/service/generate_systemd.sh

override_dh_auto_install:
dh_auto_install
install -m 755 -D target/$(BUILD_PROFILE)/g3proxy debian/tmp/usr/bin/g3proxy
install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-ctl debian/tmp/usr/bin/g3proxy-ctl
install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-ftp debian/tmp/usr/bin/g3proxy-ftp
install -m 755 -D target/$(BUILD_PROFILE)/g3proxy-lua debian/tmp/usr/bin/g3proxy-lua
install -m 644 -D $(PACKAGE_NAME)/service/[email protected] debian/tmp/lib/systemd/system/[email protected]

override_dh_installchangelogs:
dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG
Expand Down
2 changes: 1 addition & 1 deletion g3tiles/debian/compat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
1 change: 0 additions & 1 deletion g3tiles/debian/g3tiles.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
usr/bin/g3tiles
usr/bin/g3tiles-ctl
lib/systemd/system/
22 changes: 22 additions & 0 deletions g3tiles/debian/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[Unit]
Description=G3 Reverse Proxy %i
After=syslog.target network-online.target
Wants=network-online.target

[Service]
Type=simple
RuntimeDirectory=g3tiles
RuntimeDirectoryPreserve=yes
EnvironmentFile=-/etc/g3tiles/%i/env
ExecStart=/usr/bin/g3tiles -c /etc/g3tiles/%i/ --control-dir $RUNTIME_DIRECTORY -s -G %i
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/g3tiles-ctl --control-dir $RUNTIME_DIRECTORY -G %i -p $MAINPID offline
KillMode=none
Restart=on-failure
SuccessExitStatus=SIGQUIT
RestartPreventExitStatus=255
TimeoutStartSec=10
LimitNOFILE=10485760

[Install]
WantedBy=multi-user.target
2 changes: 0 additions & 2 deletions g3tiles/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ override_dh_auto_build:
cargo build --frozen --offline --profile $(BUILD_PROFILE) \
--no-default-features --features $(SSL_FEATURE),rustls-ring,quic \
--package g3tiles --package g3tiles-ctl
sh $(PACKAGE_NAME)/service/generate_systemd.sh

override_dh_auto_install:
dh_auto_install
install -m 755 -D target/$(BUILD_PROFILE)/g3tiles debian/tmp/usr/bin/g3tiles
install -m 755 -D target/$(BUILD_PROFILE)/g3tiles-ctl debian/tmp/usr/bin/g3tiles-ctl
install -m 644 -D $(PACKAGE_NAME)/service/[email protected] debian/tmp/lib/systemd/system/[email protected]

override_dh_installchangelogs:
dh_installchangelogs $(PACKAGE_NAME)/CHANGELOG
Expand Down
Loading