Skip to content

Commit

Permalink
fix: ssh.service is disabled by default
Browse files Browse the repository at this point in the history
ssh.service is disabled by default
update ChannelTimeout config to implement auto close inactive connections.

pms: BUG-273029 BUG-282797
Log:
  • Loading branch information
liujianqiang-niu authored and Zeno-sole committed Jan 20, 2025
1 parent 9a46fb3 commit 737fe6f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 2 deletions.
9 changes: 9 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
openssh (1:9.9p1-3deepin2) unstable; urgency=medium

[ liujianqiang ]
* ssh.service is disabled by default.
* update ChannelTimeout config to implement auto close inactive
connections.

-- Tianyu Chen <[email protected]> Wed, 15 Jan 2025 14:50:47 +0800

openssh (1:9.9p1-3deepin1) unstable; urgency=medium

* Refresh and re-apply deepin patches:
Expand Down
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Build-Depends:
libwrap0-dev | libwrap-dev,
pkgconf,
zlib1g-dev,
lsb-release,
Standards-Version: 4.6.2
Uploaders:
Colin Watson <[email protected]>,
Expand Down
6 changes: 6 additions & 0 deletions debian/openssh-server.ucf-md5sum
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,9 @@ a2cdc592eacf8a884829729418005d27
84066063a3f2c9412d5df7a7a0e6e293
8933d57d77504756fdde370bbdd08ee1
49d53e44b746ec2ad2103ac2860f97ff

# From 1:9.7p1-4deepin3
34f13e3344c394d1e9b8f36d55afd5e6
c94aa65d347d95e3c30aba50187b4417
3fecc6a74e3e70b0e65cdd8520c86aba
cc97f6a047873d4d9f3f962239601c74
4 changes: 2 additions & 2 deletions debian/patches/deepin-ssh-connect-idle-timeout.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Last-Update: 2022-05-19
#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
+ClientAliveInterval 900
+ClientAliveCountMax 1
+# set inactive timeout for shell & subsystem connections
+ChannelTimeout session:shell=900 session:subsystem*=900
#UseDNS no
#PidFile /var/run/sshd.pid
#MaxStartups 10:30:100
4 changes: 4 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ override_dh_installinit:
dh_installinit -R --name ssh

override_dh_installsystemd:
ifeq ($(shell lsb_release -i -s),uos)
dh_installsystemd -popenssh-server --no-enable ssh.service
else
dh_installsystemd -popenssh-server ssh.service
endif
dh_installsystemd -popenssh-server --no-enable ssh.socket
dh_installsystemd -popenssh-server --no-start rescue-ssh.target

Expand Down

0 comments on commit 737fe6f

Please sign in to comment.