diff options
| author | Jan Dittberner <jandd@cacert.org> | 2021-10-31 12:10:21 +0100 |
|---|---|---|
| committer | Jan Dittberner <jandd@cacert.org> | 2021-10-31 12:10:21 +0100 |
| commit | 9ada80dc4bfe0856270f4c09dda2afd218e8c016 (patch) | |
| tree | ee1c817c628186c761f41ee3ff7cdb7d981415db | |
| parent | 94f3cbf3f595d4fcf51b89569c14b58b7b53db3b (diff) | |
| parent | 8d8d55d18231aa9632404408c1e4cd6243e606c1 (diff) | |
| download | cacert-puppet-training.tar.gz cacert-puppet-training.tar.xz cacert-puppet-training.zip | |
Merge branch 'master' into trainingtraining
* master:
Manage /etc/network/interfaces of LXC containers only
Only perform update-ca-certificates on changes
Fix version number for debian-security check
| -rw-r--r-- | sitemodules/profiles/manifests/base.pp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp index 60563eb..0fb066b 100644 --- a/sitemodules/profiles/manifests/base.pp +++ b/sitemodules/profiles/manifests/base.pp @@ -107,12 +107,14 @@ class profiles::base ( ensure => latest, } - file { '/etc/network/interfaces': - ensure => file, - owner => 'root', - group => 'root', - mode => '0644', - content => "auto lo\niface lo inet loopback\n", + if $facts['virtual'] == 'lxc' { + file { '/etc/network/interfaces': + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + content => "auto lo\niface lo inet loopback\n", + } } Package['zsh'] -> User <| |> @@ -239,8 +241,9 @@ class profiles::base ( } exec { '/usr/sbin/update-ca-certificates': - require => Package['ca-certificates'], - subscribe => [File[$cacert_class1_file], File[$cacert_class3_file]], + require => Package['ca-certificates'], + refreshonly => true, + subscribe => [File[$cacert_class1_file], File[$cacert_class3_file]], } if ($crl_job_enable) { |