Re: [PATCH lorax rhel7-alpha2-branch] Start ssh with systemd, not in anaconda (#824580)

[Jesse Keating <jkeating@xxxxxxxxxxxxxxx>]

On 05/29/2012 05:36 AM, Radek Vykydal wrote:
> ---
>   share/config_files/common/sshd_config          |   18 ++++++++++++++++++
>   share/config_files/common/sshd_config.anaconda |   17 -----------------
>   share/runtime-postinstall.tmpl                 |    2 +-
>   3 files changed, 19 insertions(+), 18 deletions(-)
>   create mode 100644 share/config_files/common/sshd_config
>   delete mode 100644 share/config_files/common/sshd_config.anaconda
>
> diff --git a/share/config_files/common/sshd_config b/share/config_files/common/sshd_config
> new file mode 100644
> index 0000000..c826f07
> --- /dev/null
> +++ b/share/config_files/common/sshd_config
> @@ -0,0 +1,18 @@
> +# Anaconda installer settings
> +Port 22
> +HostKey /etc/ssh/ssh_host_key
> +HostKey /etc/ssh/ssh_host_rsa_key
> +HostKey /etc/ssh/ssh_host_dsa_key
> +PermitRootLogin yes
> +IgnoreRhosts yes
> +StrictModes yes
> +X11Forwarding yes
> +X11DisplayOffset 10
> +PrintMotd yes
> +XAuthLocation /sbin/xauth
> +KeepAlive yes
> +SyslogFacility AUTHPRIV
> +RSAAuthentication yes
> +PasswordAuthentication yes
> +PermitEmptyPasswords yes
> +PermitUserEnvironment yes
> diff --git a/share/config_files/common/sshd_config.anaconda b/share/config_files/common/sshd_config.anaconda
> deleted file mode 100644
> index 0c0404c..0000000
> --- a/share/config_files/common/sshd_config.anaconda
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Port 22
> -HostKey /etc/ssh/ssh_host_key
> -HostKey /etc/ssh/ssh_host_rsa_key
> -HostKey /etc/ssh/ssh_host_dsa_key
> -PermitRootLogin yes
> -IgnoreRhosts yes
> -StrictModes yes
> -X11Forwarding yes
> -X11DisplayOffset 10
> -PrintMotd yes
> -XAuthLocation /sbin/xauth
> -KeepAlive yes
> -SyslogFacility AUTHPRIV
> -RSAAuthentication yes
> -PasswordAuthentication yes
> -PermitEmptyPasswords yes
> -PermitUserEnvironment yes
> diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
> index a1acea0..f2be3f4 100644
> --- a/share/runtime-postinstall.tmpl
> +++ b/share/runtime-postinstall.tmpl
> @@ -47,7 +47,7 @@ install ${configdir}/libuser.conf etc
>   %endif
>
>   ## set up sshd
> -install ${configdir}/sshd_config.anaconda etc/ssh
> +install ${configdir}/sshd_config etc/ssh
>   install ${configdir}/pam.sshd etc/pam.d/sshd
>   install ${configdir}/pam.sshd etc/pam.d/login
>   install ${configdir}/pam.sshd etc/pam.d/remote

This one looks good, ACK

--
Help me fight child abuse: http://tinyurl.com/jlkcourage

- jlk

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list