summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2018-02-21 15:44:12 +0100
committerJan Dittberner <jandd@cacert.org>2018-02-21 15:44:12 +0100
commit56c9d6f0a804c63ccc7794ebfeba035d975fb176 (patch)
treed880d4b2b316d9127341639f7424db22dbfce133
parent21711d8f760d9fec17f73d8fdba325570d093e05 (diff)
downloadcacert-puppet-56c9d6f0a804c63ccc7794ebfeba035d975fb176.tar.gz
cacert-puppet-56c9d6f0a804c63ccc7794ebfeba035d975fb176.tar.xz
cacert-puppet-56c9d6f0a804c63ccc7794ebfeba035d975fb176.zip
change to Puppet 5 APT repo
-rw-r--r--sitemodules/profiles/manifests/base.pp13
-rw-r--r--sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp (renamed from sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp)2
2 files changed, 9 insertions, 6 deletions
diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp
index c297ac1..b9c6e46 100644
--- a/sitemodules/profiles/manifests/base.pp
+++ b/sitemodules/profiles/manifests/base.pp
@@ -96,12 +96,15 @@ class profiles::base (
require => Package['lsb-release'],
}
file { '/etc/apt/sources.list.d/puppetlabs-pc1.list':
- ensure => file,
- owner => 'root',
- group => 'root',
- mode => '0644',
+ ensure => absent,
+ }
+ file { '/etc/apt/sources.list.d/puppet5.list':
+ ensure => file,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
content => epp(
- 'profiles/base/apt_sources_puppetlabs.list.epp',
+ 'profiles/base/apt_sources_puppet5.list.epp',
{'oscodename' => $facts['os']['distro']['codename']}),
require => Package['lsb-release'],
}
diff --git a/sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp b/sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp
index 40868ed..e9c0f73 100644
--- a/sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp
+++ b/sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp
@@ -1,4 +1,4 @@
<%- | String $oscodename = "" |-%>
# THIS FILE IS MANAGED BY PUPPET, MANUAL CHANGES WILL BE OVERWRITTEN AT THE
# NEXT PUPPET RUN.
-deb http://apt.puppetlabs.com <%= $oscodename %> PC1
+deb http://apt.puppetlabs.com <%= $oscodename %> puppet5