change to Puppet 5 APT repo
authorJan Dittberner <jandd@cacert.org>
Wed, 21 Feb 2018 14:44:12 +0000 (15:44 +0100)
committerJan Dittberner <jandd@cacert.org>
Wed, 21 Feb 2018 14:44:12 +0000 (15:44 +0100)
sitemodules/profiles/manifests/base.pp
sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp [new file with mode: 0644]
sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp [deleted file]

index c297ac1..b9c6e46 100644 (file)
@@ -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_puppet5.list.epp b/sitemodules/profiles/templates/base/apt_sources_puppet5.list.epp
new file mode 100644 (file)
index 0000000..e9c0f73
--- /dev/null
@@ -0,0 +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 %> puppet5
diff --git a/sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp b/sitemodules/profiles/templates/base/apt_sources_puppetlabs.list.epp
deleted file mode 100644 (file)
index 40868ed..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<%- | 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