diff options
| -rw-r--r-- | deployment/common/manifests/base_packages.pp | 2 | ||||
| -rw-r--r-- | deployment/common/manifests/export_ssh_keys.pp | 6 | ||||
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 2 | ||||
| -rw-r--r-- | modules/blog/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 2 | ||||
| -rw-r--r-- | modules/gnupg/manifests/client.pp | 2 | ||||
| -rw-r--r-- | modules/ntp/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/opendkim/manifests/init.pp | 45 | ||||
| -rw-r--r-- | modules/subversion/manifests/client.pp | 2 |
9 files changed, 55 insertions, 10 deletions
diff --git a/deployment/common/manifests/base_packages.pp b/deployment/common/manifests/base_packages.pp index 2d7d57d0..091e7c3e 100644 --- a/deployment/common/manifests/base_packages.pp +++ b/deployment/common/manifests/base_packages.pp @@ -16,7 +16,7 @@ class common::base_packages { 'iotop', 'wget'] - if $facts['architecture'] == 'x86_64' { + if $::architecture == 'x86_64' { package { ['mcelog']: } } diff --git a/deployment/common/manifests/export_ssh_keys.pp b/deployment/common/manifests/export_ssh_keys.pp index f8896e7a..55b8f33b 100644 --- a/deployment/common/manifests/export_ssh_keys.pp +++ b/deployment/common/manifests/export_ssh_keys.pp @@ -1,7 +1,7 @@ class common::export_ssh_keys { - @@sshkey { $facts['fqdn']: + @@sshkey { $::fqdn: type => 'rsa', - key => $facts['sshrsakey'], - host_aliases => [$facts['ipaddress'],$facts['hostname']], + key => $::sshrsakey, + host_aliases => [$::ipaddress,$::hostname], } } diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 1124bfc1..16f8cb68 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -16,7 +16,7 @@ class mga_buildsystem::config { } class { 'buildsystem::var::iurt': - timeout_multiplier => $facts['architecture'] ? { + timeout_multiplier => $::architecture ? { /arm/ => 4, 'aarch64' => 2, default => 1, diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 5d5337a7..c89a8168 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -15,7 +15,7 @@ class blog { } class files_bots inherits base { -if versioncmp($facts['lsbdistrelease'], '9') < 0 { +if versioncmp($::lsbdistrelease, '9') < 0 { package { ['php-mysqlnd', 'php-ldap', 'unzip', diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index 0e48363a..5bf16b53 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -4,7 +4,7 @@ class buildsystem::binrepo { include sudo # upload-bin script uses the mailx command provided by nail -if versioncmp($facts['lsbdistrelease'], '9') < 0 { +if versioncmp($::lsbdistrelease, '9') < 0 { package { 'nail': ensure => installed, } diff --git a/modules/gnupg/manifests/client.pp b/modules/gnupg/manifests/client.pp index 4dfaeec4..301e569a 100644 --- a/modules/gnupg/manifests/client.pp +++ b/modules/gnupg/manifests/client.pp @@ -1,5 +1,5 @@ class gnupg::client { -if versioncmp($facts['lsbdistrelease'], '7') < 0 { +if versioncmp($::lsbdistrelease, '7') < 0 { package {['gnupg', 'rng-utils']: } diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp index 03d8441c..f75310e7 100644 --- a/modules/ntp/manifests/init.pp +++ b/modules/ntp/manifests/init.pp @@ -1,5 +1,5 @@ class ntp { -if versioncmp($facts['lsbdistrelease'], '9') < 0 { +if versioncmp($::lsbdistrelease, '9') < 0 { $ntppkg = 'ntp' } else { $ntppkg = 'ntpsec' diff --git a/modules/opendkim/manifests/init.pp b/modules/opendkim/manifests/init.pp index 16d3d641..6e45345a 100644 --- a/modules/opendkim/manifests/init.pp +++ b/modules/opendkim/manifests/init.pp @@ -41,6 +41,51 @@ class opendkim ( ensure => present, } + case $::operatingsystem { + /^(Debian|Ubuntu)$/: { + package { 'opendkim-tools': + ensure => present, + } + # Debian/Ubuntu doesn't ship this directory in its package + file { $pathconf: + ensure => directory, + owner => 'root', + group => 'opendkim', + mode => '0755', + require => Package[$package_name], + } + file { "${pathconf}/keys": + ensure => directory, + owner => 'opendkim', + group => 'opendkim', + mode => '0750', + require => Package[$package_name], + } + file { "${pathconf}/KeyTable": + ensure => present, + owner => 'opendkim', + group => 'opendkim', + mode => '0640', + require => Package[$package_name], + } + file { "${pathconf}/SigningTable": + ensure => present, + owner => 'opendkim', + group => 'opendkim', + mode => '0640', + require => Package[$package_name], + } + file { "${pathconf}/TrustedHosts": + ensure => present, + owner => 'opendkim', + group => 'opendkim', + mode => '0644', + require => Package[$package_name], + } + } + default: {} + } + file {'/etc/opendkim.conf': ensure => file, owner => 'root', diff --git a/modules/subversion/manifests/client.pp b/modules/subversion/manifests/client.pp index eb098eaa..083a58da 100644 --- a/modules/subversion/manifests/client.pp +++ b/modules/subversion/manifests/client.pp @@ -4,7 +4,7 @@ class subversion::client { # without it, # https://mail-index.netbsd.org/pkgsrc-users/2008/11/23/msg008706.html # - $sasl2_package = $facts['architecture'] ? { + $sasl2_package = $::architecture ? { x86_64 => 'lib64sasl2-plug-anonymous', default => 'libsasl2-plug-anonymous' } |