From ff7af2ea978af6fffea47dbc2a73c4e1ed8ae84e Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Thu, 17 Sep 2015 11:45:27 +0300 Subject: [PATCH 1/6] backuppc: Fix depency error from .ssh directory when $backuppc_datadir is not defined. --- backuppc/manifests/init.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/backuppc/manifests/init.pp b/backuppc/manifests/init.pp index 3b74c3f..8713faa 100644 --- a/backuppc/manifests/init.pp +++ b/backuppc/manifests/init.pp @@ -202,6 +202,7 @@ class backuppc::server { mode => "0750", owner => "root", group => "backuppc", + require => Package["BackupPC"], } file { "/var/lib/BackupPC/.ssh/id_rsa": ensure => present, From 6626efcbc5a867856ec038948396677e32bf2993 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Fri, 18 Sep 2015 11:37:48 +0300 Subject: [PATCH 2/6] clamav: Add support for CentOS/RedHat 7. --- clamav/manifests/init.pp | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/clamav/manifests/init.pp b/clamav/manifests/init.pp index 88c1563..92ae554 100644 --- a/clamav/manifests/init.pp +++ b/clamav/manifests/init.pp @@ -6,15 +6,31 @@ # $update: # Set to false to disable automatic virus database updates. # -class clamav($update="true") { +class clamav($update=true) { package { "clamav": ensure => installed, } - if $update == false { - file { "/etc/cron.daily/freshclam": - ensure => absent, + case $::operatingsystem { + "centos","redhat": { + if (versioncmp($::operatingsystemrelease, 7) < 0) { + if (!$update) { + file { "/etc/cron.daily/freshclam": + ensure => absent, + } + } + } else { + package { "clamav-update": + ensure => $update ? { + true => "present", + false => "absent", + } + } + } + } + default: { + fail("clamav module not supported on ${::operatingsystem}") } } From 6db1ca7175549e466c3f105108112c1a059d741b Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Fri, 18 Sep 2015 12:41:04 +0300 Subject: [PATCH 3/6] clamav: Fix clamav::daemon for CentOS/RedHat 7 --- clamav/manifests/init.pp | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/clamav/manifests/init.pp b/clamav/manifests/init.pp index 92ae554..439fc2a 100644 --- a/clamav/manifests/init.pp +++ b/clamav/manifests/init.pp @@ -43,13 +43,49 @@ class clamav::daemon { require clamav + case $::operatingsystem { + "centos","redhat": { + if (versioncmp($::operatingsystemrelease, 7) < 0) { + $package = "clamd" + $service = "clamd" + } else { + $package = "clamav-scanner-systemd" + $service = "clamd@scan" + exec { "sed -i 's/^Example$/#Example/' /etc/clamd.d/scan.conf": + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => "root", + onlyif => "egrep '^Example$' /etc/clamd.d/scan.conf", + require => Package["clamd"], + notify => Service["clamd"], + } + exec { "sed -i 's/^#LocalSocket /LocalSocket /' /etc/clamd.d/scan.conf": + path => "/bin:/usr/bin:/sbin:/usr/sbin", + user => "root", + onlyif => "egrep '#LocalSocket ' /etc/clamd.d/scan.conf", + require => Package["clamd"], + notify => Service["clamd"], + } + file { "/etc/clamd.conf": + ensure => link, + target => "/etc/clamd.d/scan.conf", + owner => "root", + group => "root", + require => Package["clamd"], + } + } + } + } + package { "clamd": ensure => installed, + name => $package, } service { "clamd": - ensure => running, - enable => true, + ensure => running, + name => $service, + enable => true, + require => Package["clamd"], } } From c2df754fa6d280b76a14c127a829c11e5c55eb59 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Tue, 22 Sep 2015 21:26:02 +0300 Subject: [PATCH 4/6] sasl: Fix kerberos mech for saslauthd on CentOS/RedHat 7. --- sasl/manifests/init.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sasl/manifests/init.pp b/sasl/manifests/init.pp index 36cf674..99fa85e 100644 --- a/sasl/manifests/init.pp +++ b/sasl/manifests/init.pp @@ -94,10 +94,16 @@ class sasl::saslauthd { augeas { "set-saslauthd-mech": context => "/files/etc/sysconfig/saslauthd", changes => [ "set MECH kerberos5", - "set KRB5_KTNAME '\"/etc/saslauthd.keytab\"'", - "set @export KRB5_KTNAME", ], + "set KRB5_KTNAME '\"/etc/saslauthd.keytab\"'", ], notify => Service["saslauthd"], } + if versioncmp($::operatingsystemrelease, 7) < 0 { + augeas { "export-saslauthd-keytab": + context => "/files/etc/sysconfig/saslauthd", + changes => "set @export KRB5_KTNAME", + notify => Service["saslauthd"], + } + } $user = "saslauth" } "openbsd": { From 50d2d9b327deb058478d93589b19e87aada5639b Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Tue, 29 Sep 2015 15:09:40 +0300 Subject: [PATCH 5/6] cups: Fixed cups::lpd for CentOS/RedHat 7. --- cups/manifests/init.pp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cups/manifests/init.pp b/cups/manifests/init.pp index b54ae9a..83b1123 100644 --- a/cups/manifests/init.pp +++ b/cups/manifests/init.pp @@ -220,15 +220,23 @@ define cups::printer($uri, $location = "", $ensure = present) { class cups::lpd { include cups::server - include inetd::server package { "cups-lpd": ensure => installed, } - inetd::service { "cups-lpd": - ensure => present, - require => Package["cups-lpd"], + if $::operatingsystem in ["CentOS","RedHat"] and versioncmp($::operatingsystemrelease, "7") > 0 { + service { "cups-lpd.socket": + ensure => running, + enable => true, + require => Package["cups-lpd"], + } + } else { + include inetd::server + inetd::service { "cups-lpd": + ensure => present, + require => Package["cups-lpd"], + } } } From bfe0ff4216219ca1332d05d60736e21c3421cb47 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 30 Sep 2015 07:18:07 +0000 Subject: [PATCH 6/6] network: Disable IPv6 zeroconf in CentOS/RHEL when IPv6 address is specified --- network/templates/ifcfg-if.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/network/templates/ifcfg-if.erb b/network/templates/ifcfg-if.erb index 5ceb90a..9eebd14 100644 --- a/network/templates/ifcfg-if.erb +++ b/network/templates/ifcfg-if.erb @@ -17,11 +17,14 @@ NOZEROCONF=yes <% end -%> <% if @ip6addr == 'none' -%> IPV6INIT=no +IPV6_AUTOCONF=no +<% elsif @ip6addr == 'auto' -%> +IPV6INIT=yes +IPV6_AUTOCONF=yes <% else -%> IPV6INIT=yes -<% if @ip6addr != 'auto' -%> +IPV6_AUTOCONF=no IPV6ADDR=<%= @ip6addr %>/<%= @ip6netmask %> -<% end -%> <% end -%> <% if @name =~ /br[0-9]/ -%> TYPE=Bridge