diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2017-09-24 11:48:52 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2017-09-24 11:48:52 +0100 |
| commit | a84eb42fd2924999e274c28310e33109ab61cf00 (patch) | |
| tree | 99afc11cd89c7d22d9387e8db4b41fce3d461c1b /modules | |
| parent | b4eb32a03e22dfbccf7465944a13a4052fe03b5d (diff) | |
| download | puppet-a84eb42fd2924999e274c28310e33109ab61cf00.tar puppet-a84eb42fd2924999e274c28310e33109ab61cf00.tar.gz puppet-a84eb42fd2924999e274c28310e33109ab61cf00.tar.bz2 puppet-a84eb42fd2924999e274c28310e33109ab61cf00.tar.xz puppet-a84eb42fd2924999e274c28310e33109ab61cf00.zip | |
Make Mageia 6 fix more widely avaialable
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/openssh/templates/sshd_config | 12 | ||||
| -rw-r--r-- | modules/postfix/templates/main.cf | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index 039467a7..f6fff438 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -22,11 +22,11 @@ HostKey /etc/ssh/ssh_host_key # HostKeys for protocol version 2 HostKey /etc/ssh/ssh_host_rsa_key -<% if @hostname == 'neru' then %> +<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> +HostKey /etc/ssh/ssh_host_dsa_key +<% else %> HostKey /etc/ssh/ssh_host_ecdsa_key HostKey /etc/ssh/ssh_host_ed25519_key -<% else %> -HostKey /etc/ssh/ssh_host_dsa_key <% end %> # Lifetime and size of ephemeral version 1 server key @@ -119,10 +119,10 @@ UsePrivilegeSeparation yes #Banner none # override default of no subsystems -<% if @hostname == 'neru' then %> -Subsystem sftp /usr/libexec/openssh/sftp-server -<% else %> +<% if scope.function_versioncmp([lsbdistrelease, '6']) < 0 -%> Subsystem sftp <%= path_to_sftp %>/sftp-server +<% else %> +Subsystem sftp /usr/libexec/openssh/sftp-server <% end %> # Example of overriding settings on a per-user basis diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 2d40c90e..f3098cbd 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -11,13 +11,13 @@ sendmail_path = /usr/sbin/sendmail.postfix setgid_group = postdrop command_directory = /usr/sbin manpage_directory = /usr/share/man -<% if @hostname == 'neru' then %> +<% if scope.function_versioncmp([lsbdistrelease, '3']) < 0 -%> +daemon_directory = <%= lib_dir %>/postfix/ +<% else %> daemon_directory = /usr/libexec/postfix meta_directory = /etc/postfix shlib_directory = /usr/lib64 compatibility_level = 2 -<% else %> -daemon_directory = <%= lib_dir %>/postfix/ <% end %> data_directory = /var/lib/postfix newaliases_path = /usr/bin/newaliases |