diff options
| author | Jan Dittberner <jandd@cacert.org> | 2019-07-15 19:56:10 +0200 |
|---|---|---|
| committer | Jan Dittberner <jandd@cacert.org> | 2019-07-15 19:56:10 +0200 |
| commit | 57bf27932c93990492c9c1daa99b277dc65993c3 (patch) | |
| tree | d606d2ef54408198977530ae13fce89710b6dd83 | |
| parent | e34c782ec82fafc64eedeb2b68cf8af976e0c5b5 (diff) | |
| download | cacert-puppet-57bf27932c93990492c9c1daa99b277dc65993c3.tar.gz cacert-puppet-57bf27932c93990492c9c1daa99b277dc65993c3.tar.xz cacert-puppet-57bf27932c93990492c9c1daa99b277dc65993c3.zip | |
Switch to Puppet 6
| -rw-r--r-- | sitemodules/profiles/manifests/base.pp | 13 | ||||
| -rw-r--r-- | sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp (renamed from sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp) | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp index 2b781a5..14efbaa 100644 --- a/sitemodules/profiles/manifests/base.pp +++ b/sitemodules/profiles/manifests/base.pp @@ -79,14 +79,6 @@ class profiles::base ( shell => '/usr/bin/zsh', } - file { '/etc/init.d/puppet': - ensure => file, - owner => 'root', - group => 'root', - mode => '0755', - source => 'puppet:///modules/profiles/puppet.init', - } - file { '/etc/apt/apt.conf.d/03proxy': ensure => file, owner => 'root', @@ -147,12 +139,15 @@ class profiles::base ( ensure => absent, } file { '/etc/apt/sources.list.d/puppet5.list': + ensure => absent, + } + file { '/etc/apt/sources.list.d/puppet6.list': ensure => file, owner => 'root', group => 'root', mode => '0644', content => epp( - 'profiles/base/apt_sources_puppet5.list.epp', + 'profiles/base/apt_sources_puppet6.list.epp', { 'oscodename' => $facts['os']['distro']['codename'] }), require => Package['lsb-release'], } diff --git a/sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp b/sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp index 33c0dfb..1deaafb 100644 --- a/sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp +++ b/sitemodules/profiles/templates/base/apt_sources_puppet6.list.epp @@ -1,12 +1,12 @@ <%- | String $oscodename = "" |-%> # THIS FILE IS MANAGED BY PUPPET, MANUAL CHANGES WILL BE OVERWRITTEN AT THE # NEXT PUPPET RUN. -# Puppet 5 <%= $oscodename %> Repository -deb http://apt.puppetlabs.com <%= $oscodename %> puppet5 +# Puppet 6 <%= $oscodename %> Repository +deb http://apt.puppetlabs.com <%= $oscodename %> puppet6 -# Puppet 5 <%= $oscodename %> Source Repository +# Puppet 6 <%= $oscodename %> Source Repository # The source repos are commented out by default because we # do not always make sources available for all packages or # for all platforms. If you want to access the source repos, # uncomment the following line. -#deb-src http://apt.puppetlabs.com <%= $oscodename %> puppet5 +#deb-src http://apt.puppetlabs.com <%= $oscodename %> puppet6 |