Skip to content

feat(openssh): add config file for ClientAliveInterval #17037

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

Merged
ddstreetmicrosoft merged 4 commits into from
May 6, 2026
+46 −3
Merged

feat(openssh): add config file for ClientAliveInterval #17037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f938d4
feat(azurelinux-release): set component to manual release mode
ddstreet May 5, 2026
2d77431
chore(azurelinux-release): no-change release bump to match "rendered"…
ddstreet May 6, 2026
dc5de47
feat: add config file for openssh ClientAliveInterval
ddstreet May 5, 2026
26ef8d4
chore(azurelinux-release): update 'lock' file
ddstreet May 6, 2026
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
10 changes: 10 additions & 0 deletions base/comps/azurelinux-release/50-client-alive-interval.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# This is included only to meet Azure compliance testing, and is
# unnecessary in a AzureLinux 4.0 VM cloud instance, because we set
Comment thread
ddstreet marked this conversation as resolved.
# the sysctl net.ipv4.tcp_keepalive_time to 120, which serves to keep
# all idle TCP connections (including all TCP ssh connections) from
# being disconnected. This setting does not add or improve any
# security, nor does it cause idle ssh clients to be disconnected (in
# fact, it does the exact opposite - it prevents idle ssh connections
# from being disconnected).
Comment thread
ddstreet marked this conversation as resolved.
Comment thread
ddstreet marked this conversation as resolved.
ClientAliveInterval 180
1 change: 1 addition & 0 deletions base/comps/azurelinux-release/azurelinux-release.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[components.azurelinux-release]
spec = { type = "local", path = "azurelinux-release.spec" }
release = { calculation = "manual" }
13 changes: 12 additions & 1 deletion base/comps/azurelinux-release/azurelinux-release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Summary: Azure Linux release files
Name: azurelinux-release
Version: 4.0
# TODO(azl): Review whether we can move back to autorelease (with conditional -p)
Release: 11%{?dist}
Release: 13%{?dist}
License: MIT
URL: https://aka.ms/azurelinux

Expand All @@ -56,6 +56,7 @@ Source17: 20-azure.conf
Source20: chrony-azure.conf
Source21: 50-azure-cloud.conf
Source22: 70-azurelinux-hardening.conf
Source23: 50-client-alive-interval.conf

BuildArch: noarch

Expand Down Expand Up @@ -339,6 +340,7 @@ sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.cloud
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_prefix}/lib/sysctl.d/
install -Dm0644 %{SOURCE20} -t %{buildroot}%{_sysconfdir}/chrony.d/
install -Dm0644 %{SOURCE21} -t %{buildroot}%{_prefix}/lib/systemd/networkd.conf.d/
install -Dm0600 %{SOURCE23} -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/
Comment thread
ddstreet marked this conversation as resolved.
%endif

%if %{with container}
Expand All @@ -350,6 +352,7 @@ echo "VARIANT_ID=container" >> %{buildroot}%{_prefix}/lib/os-release.container
sed -i -e "s|(%{release_name}%{?prerelease})|(Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.container
sed -e "s#\$version#%{bug_version}#g" -e 's/$variant/Container/;s/<!--.*-->//;/^$/d' %{SOURCE15} > %{buildroot}%{_swidtagdir}/com.microsoft.AzureLinux-variant.swidtag.container
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_prefix}/lib/sysctl.d/
install -Dm0600 %{SOURCE23} -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/
Comment thread
ddstreet marked this conversation as resolved.
%endif

%if %{with wsl}
Expand Down Expand Up @@ -448,6 +451,7 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/
%{_prefix}/lib/sysctl.d/20-azure.conf
%{_sysconfdir}/chrony.d/chrony-azure.conf
%{_prefix}/lib/systemd/networkd.conf.d/50-azure-cloud.conf
%{_sysconfdir}/ssh/sshd_config.d/50-client-alive-interval.conf
%endif


Expand All @@ -457,6 +461,7 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/
%{_prefix}/lib/os-release.container
%attr(0644,root,root) %{_swidtagdir}/com.microsoft.AzureLinux-variant.swidtag.container
%{_prefix}/lib/sysctl.d/20-azure.conf
%{_sysconfdir}/ssh/sshd_config.d/50-client-alive-interval.conf
%endif


Expand All @@ -469,6 +474,12 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/


%changelog
* Wed May 06 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-13
- add 50-client-alive-interval.conf

* Wed May 06 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-12
- no-change bump to match "rendered" spec release

* Thu Apr 23 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-11
- Revert proc-version-override

Expand Down
2 changes: 1 addition & 1 deletion locks/azurelinux-release.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Managed by azldev component update. Do not edit manually.
version = 1
input-fingerprint = 'sha256:6cde34c9e164e490529b903d2e9763f6763be4abba745e5bc09abeec01a0ade9'
input-fingerprint = 'sha256:2558a97576130f511fb4d07eece8aa7969c35fe1257e422843b99dd9d5a000a2'
10 changes: 10 additions & 0 deletions specs/a/azurelinux-release/50-client-alive-interval.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

# This is included only to meet Azure compliance testing, and is
# unnecessary in a AzureLinux 4.0 VM cloud instance, because we set
# the sysctl net.ipv4.tcp_keepalive_time to 120, which serves to keep
# all idle TCP connections (including all TCP ssh connections) from
# being disconnected. This setting does not add or improve any
# security, nor does it cause idle ssh clients to be disconnected (in
# fact, it does the exact opposite - it prevents idle ssh connections
# from being disconnected).
ClientAliveInterval 180
13 changes: 12 additions & 1 deletion specs/a/azurelinux-release/azurelinux-release.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Summary: Azure Linux release files
Name: azurelinux-release
Version: 4.0
# TODO(azl): Review whether we can move back to autorelease (with conditional -p)
Release: 12%{?dist}
Release: 13%{?dist}
License: MIT
URL: https://aka.ms/azurelinux

Expand All @@ -59,6 +59,7 @@ Source17: 20-azure.conf
Source20: chrony-azure.conf
Source21: 50-azure-cloud.conf
Source22: 70-azurelinux-hardening.conf
Source23: 50-client-alive-interval.conf

BuildArch: noarch

Expand Down Expand Up @@ -342,6 +343,7 @@ sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.cloud
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_prefix}/lib/sysctl.d/
install -Dm0644 %{SOURCE20} -t %{buildroot}%{_sysconfdir}/chrony.d/
install -Dm0644 %{SOURCE21} -t %{buildroot}%{_prefix}/lib/systemd/networkd.conf.d/
install -Dm0600 %{SOURCE23} -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/
%endif

%if %{with container}
Expand All @@ -353,6 +355,7 @@ echo "VARIANT_ID=container" >> %{buildroot}%{_prefix}/lib/os-release.container
sed -i -e "s|(%{release_name}%{?prerelease})|(Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.container
sed -e "s#\$version#%{bug_version}#g" -e 's/$variant/Container/;s/<!--.*-->//;/^$/d' %{SOURCE15} > %{buildroot}%{_swidtagdir}/com.microsoft.AzureLinux-variant.swidtag.container
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_prefix}/lib/sysctl.d/
install -Dm0600 %{SOURCE23} -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d/
%endif

%if %{with wsl}
Expand Down Expand Up @@ -451,6 +454,7 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/
%{_prefix}/lib/sysctl.d/20-azure.conf
%{_sysconfdir}/chrony.d/chrony-azure.conf
%{_prefix}/lib/systemd/networkd.conf.d/50-azure-cloud.conf
%{_sysconfdir}/ssh/sshd_config.d/50-client-alive-interval.conf
%endif


Expand All @@ -460,6 +464,7 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/
%{_prefix}/lib/os-release.container
%attr(0644,root,root) %{_swidtagdir}/com.microsoft.AzureLinux-variant.swidtag.container
%{_prefix}/lib/sysctl.d/20-azure.conf
%{_sysconfdir}/ssh/sshd_config.d/50-client-alive-interval.conf
%endif


Expand All @@ -472,6 +477,12 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/


%changelog
* Wed May 06 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-13
- add 50-client-alive-interval.conf

* Wed May 06 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-12
- no-change bump to match "rendered" spec release

* Thu Apr 23 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-11
- Revert proc-version-override

Expand Down
Loading