X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Finit.pp;h=943c36946dbe72aa29b6a83647e1808c219b816b;hb=faf0b00a7b3ef90757b7fcf9dec93c9987383f8a;hp=93905c4ba1de4b3ea4455e07eb89c95bdec4416d;hpb=53b6e72a45a0fb7632251242893c3c3ce794a6b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 93905c4ba..943c36946 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,12 +12,8 @@ class debian_org {
 		$servicefiles = 'absent'
 	}
 
-	# the virtual facter needs virt-what on jessie to work
-	if versioncmp($::lsbmajdistrelease, '9') < 0 {
-		package { 'virt-what': ensure => installed }
-	} else {
-		package { 'virt-what': ensure => purged }
-	}
+	# the virtual facter needs virt-what on jessie to work; clean up.
+	package { 'virt-what': ensure => purged }
 
 	$samhain_recipients = hiera('samhain_recipients')
 	$root_mail_alias = hiera('root_mail_alias')
@@ -118,12 +114,10 @@ class debian_org {
 		content => "Etc/UTC\n",
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
-	if versioncmp($::lsbmajdistrelease, '9') >= 0 { # jessie has a regular file there, for instance
-		file { '/etc/localtime':
-			ensure => 'link',
-			target => '/usr/share/zoneinfo/Etc/UTC',
-			notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
-		}
+	file { '/etc/localtime':
+		ensure => 'link',
+		target => '/usr/share/zoneinfo/Etc/UTC',
+		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
 	file { '/etc/puppet/puppet.conf':
 		content => template('debian_org/puppet.conf.erb'),
@@ -164,9 +158,16 @@ class debian_org {
 		notify => Exec['systemctl daemon-reload'],
 	}
 
-	concat { '/etc/cron.d/dsa-puppet-stuff': }
-	concat::fragment { 'dsa-puppet-stuff---header':
-		target => '/etc/cron.d/dsa-puppet-stuff',
+	file { '/etc/cron.d/dsa-puppet-stuff':
+		ensure => 'absent',
+	}
+	file { '/etc/dsa/cron.ignore.dsa-puppet-stuff':
+		ensure => 'absent',
+	}
+
+	concat { '/etc/cron.d/puppet-crontab': }
+	concat::fragment { 'puppet-crontab---header':
+		target => '/etc/cron.d/puppet-crontab',
 		order  => '000',
 		content  => @(EOF)
 			## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
@@ -175,10 +176,10 @@ class debian_org {
 			PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
 			| EOF
 	}
-	concat::fragment { 'dsa-puppet-stuff---all':
-		target => '/etc/cron.d/dsa-puppet-stuff',
+	concat::fragment { 'puppet-crontab---all':
+		target => '/etc/cron.d/puppet-crontab',
 		order  => '010',
-		content => template('debian_org/dsa-puppet-stuff.cron.erb'),
+		content => template('debian_org/puppet-crontab.cron.erb'),
 		require => Package['debian.org'],
 	}
 	file { '/etc/ldap/ldap.conf':
@@ -202,8 +203,8 @@ class debian_org {
 		ensure => directory,
 		mode   => '0755',
 	}
-	file { '/etc/dsa/cron.ignore.dsa-puppet-stuff':
-		source  => 'puppet:///modules/debian_org/dsa-puppet-stuff.cron.ignore',
+	file { '/etc/dsa/cron.ignore.puppet-crontab':
+		source  => 'puppet:///modules/debian_org/puppet-crontab.cron.ignore',
 		require => Package['debian.org']
 	}
 	file { '/etc/nsswitch.conf':
@@ -268,8 +269,7 @@ class debian_org {
 		group  => root,
 	}
 	file { '/usr/local/bin/dsa-is-shutdown-scheduled':
-		source	=> 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
-		mode	=> '0555',
+		ensure => 'absent',
 	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
@@ -339,6 +339,18 @@ class debian_org {
 		value => '1',
 	}
 
+	# our ipv6 addresses and routes are statically configured.
+	file { '/etc/network/if-pre-up.d/no_accept_ra':
+		source => 'puppet:///modules/debian_org/ifupdown-pre-up-accept-ra',
+		mode   => '0555',
+	}
+	base::sysctl { 'dsa-accept-ra-default':
+		ensure => absent,
+	}
+	base::sysctl { 'dsa-accept-ra-all':
+		ensure => absent,
+	}
+
 	# Disable kpartx udev rules
 	file { '/etc/udev/rules.d/60-kpartx.rules':
 		ensure => $has_lib_udev_rules_d_60_kpartx_rules ? { true  => 'present', default => 'absent' },