Refactor patches for openssh package
Use openssh-config package to package config and service files for openssh package. Merge adding source patch and spec related change to one meta patch named spec-include-Tis-chnages.patch. Deployment test and ping test between VMs pass Config files check pass. Story: 2003768 Task: 27588 Change-Id: I77cd054707d11dace1c47e8477d0e30b69719a38 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
parent
ccd754d835
commit
e8469c6d29
2
openssh-config/centos/build_srpm.data
Normal file
2
openssh-config/centos/build_srpm.data
Normal file
@ -0,0 +1,2 @@
|
||||
SRC_DIR="files"
|
||||
TIS_PATCH_VER=0
|
40
openssh-config/centos/openssh-config.spec
Normal file
40
openssh-config/centos/openssh-config.spec
Normal file
@ -0,0 +1,40 @@
|
||||
Summary: openssh-config
|
||||
Name: openssh-config
|
||||
Version: 1.0
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
License: Apache-2.0
|
||||
Group: base
|
||||
Packager: StarlingX
|
||||
URL: unknown
|
||||
BuildArch: noarch
|
||||
Source: %name-%version.tar.gz
|
||||
|
||||
Requires: %{_bindir}/systemctl
|
||||
Requires: openssh
|
||||
Summary: package StarlingX configuration files of openssh to system folder.
|
||||
|
||||
%description
|
||||
package StarlingX configuration files of openssh to system folder.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
%{__install} -d %{buildroot}%{_datadir}/starlingx
|
||||
%{__install} -d %{buildroot}%{_sysconfdir}/systemd/system
|
||||
%{__install} -m 644 sshd.pam %{buildroot}%{_datadir}/starlingx/sshd.pam
|
||||
%{__install} -m 644 sshd.service %{buildroot}%{_sysconfdir}/systemd/system/sshd.service
|
||||
|
||||
%post
|
||||
%define _pamconfdir %{_sysconfdir}/pam.d
|
||||
if [ $1 -eq 1 ] ; then
|
||||
# Initial installation
|
||||
cp -f %{_datadir}/starlingx/sshd.pam %{_pamconfdir}/sshd
|
||||
fi
|
||||
%{_bindir}/systemctl disable sshd.service > /dev/null 2>&1 || :
|
||||
|
||||
%files
|
||||
%{_datadir}/starlingx/sshd.pam
|
||||
%{_sysconfdir}/systemd/system/sshd.service
|
24
openssh-config/files/sshd.pam
Normal file
24
openssh-config/files/sshd.pam
Normal file
@ -0,0 +1,24 @@
|
||||
# WRSM-1.0
|
||||
|
||||
auth include common-auth
|
||||
account required pam_nologin.so
|
||||
|
||||
# SELinux needs to be the first session rule. This ensures that any
|
||||
# lingering context has been cleared. Without out this it is possible
|
||||
# that a module could execute code in the wrong domain.
|
||||
# When the module is present, "required" would be sufficient (When SELinux
|
||||
# is disabled, this returns success.)
|
||||
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
|
||||
|
||||
account include common-account
|
||||
password include common-password
|
||||
session optional pam_keyinit.so force revoke
|
||||
session include common-session
|
||||
session required pam_loginuid.so
|
||||
|
||||
# SELinux needs to intervene at login time to ensure that the process
|
||||
# starts in the proper default security context. Only sessions which are
|
||||
# intended to run in the user's context should be run after this.
|
||||
# When the module is present, "required" would be sufficient (When SELinux
|
||||
# is disabled, this returns success.)
|
||||
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
|
18
openssh-config/files/sshd.service
Normal file
18
openssh-config/files/sshd.service
Normal file
@ -0,0 +1,18 @@
|
||||
[Unit]
|
||||
Description=OpenSSH server daemon
|
||||
Documentation=man:sshd(8) man:sshd_config(5)
|
||||
After=network.target sshd-keygen.service
|
||||
Wants=sshd-keygen.service
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/sshd
|
||||
ExecStart=/etc/init.d/sshd start
|
||||
ExecStop=/etc/init.d/sshd stop
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
PIDFile=/var/run/sshd.pid
|
||||
KillMode=none
|
||||
#Restart=on-failure
|
||||
#RestartSec=42s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
Loading…
x
Reference in New Issue
Block a user