X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=a6270d8b3d20368a6b149c389cd06fb28db6a7d7;hb=93132ac1a38e33dc6d026fa5feec1f501a5cbaca;hp=161ab51c5a40f41a21ac67bcbd620182ad77d496;hpb=7a0b5ea7181cc3ddfc465423a7e51f04ee4c2a97;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 161ab51c..a6270d8b 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -101,6 +101,7 @@ class debian-org {
 
 	file { '/etc/apt/trusted-keys.d':
 		ensure => absent,
+		force  => true,
 	}
 
 	file { '/etc/apt/trusted.gpg':
@@ -113,6 +114,17 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
+	if $::lsbmajdistrelease < 7 {
+		site::aptrepo { 'debian-lts':
+			url        => $mirror,
+			suite      => "${::lsbdistcodename}-lts",
+			components => ['main','contrib','non-free']
+		}
+	} else {
+		site::aptrepo { 'debian-lts':
+			ensure => absent,
+		}
+	}
 
 	site::aptrepo { 'backports.debian.org':
 		url        => $mirror_backports,
@@ -294,4 +306,14 @@ class debian-org {
 		matches  => [ 'paths', 'contents' ],
 		schedule => weekly
 	}
+
+	file { '/root/.bashrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+	}
+	file { '/root/.screenrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+	}
+	file { '/root/.vimrc':
+		source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+	}
 }