D2778.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2778.diff
View Options

	diff --git a/roles/core/sshd/files/sshd_config b/roles/core/sshd/files/sshd_config
	--- a/roles/core/sshd/files/sshd_config
	+++ b/roles/core/sshd/files/sshd_config
	@@ -18,7 +18,7 @@
	# but this is overridden so installations will only check .ssh/authorized_keys
	AuthorizedKeysFile .ssh/authorized_keys

	-{% if grains['os'] == 'CentOS' -%}
	+{% if grains['os_family'] == 'RedHat' -%}
	# Don't use host DSA key (CentOS by default uses it, see T1352)
	HostKey /etc/ssh/ssh_host_rsa_key
	HostKey /etc/ssh/ssh_host_ecdsa_key
	diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
	--- a/roles/core/userland-software/init.sls
	+++ b/roles/core/userland-software/init.sls
	@@ -12,7 +12,7 @@
	# Software sources
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-{% if grains['os'] == 'CentOS' %}
	+{% if grains['os_family'] == 'RedHat' && grains['os'] != 'Fedora' %}
	epel-release:
	pkg.installed

	diff --git a/roles/paas-docker/docker/software.sls b/roles/paas-docker/docker/software.sls
	--- a/roles/paas-docker/docker/software.sls
	+++ b/roles/paas-docker/docker/software.sls
	@@ -12,7 +12,7 @@
	# Install Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-{% if grains['os'] == 'CentOS' %}
	+{% if grains['os_family'] == 'RedHat' && grains['os'] != 'Fedora' %}
	remove_legacy_docker_packages:
	pkg.removed:
	- pkgs: