X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Finit.pp;h=5619032ffbe8ec64e82e8f452066188b5af4c1c3;hb=3e9afb3bef8cdc6fb8ebca8109842d8d35e8c423;hp=7e474c1e988066c42da3872c2cdcdd0c4d72a452;hpb=55c6cf12f1e2fdae967db9c70c3902dfa82b5481;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index 7e474c1e9..5619032ff 100644
--- a/modules/hardware/manifests/init.pp
+++ b/modules/hardware/manifests/init.pp
@@ -5,6 +5,10 @@ class hardware {
 		file { '/etc/apt/preferences.d/dsa-hp-tools':
 			content => "Package: hp-health\nPin: version 8.6*\nPin-Priority: 1100\n"
 		}
+	#} elsif "$::systemproductname" in ["ProLiant DL380 G5", "ProLiant DL360 G5", "ProLiant DL380 G6", "ProLiant DL360 G6", "ProLiant BL495c G5"] {
+	#	file { '/etc/apt/preferences.d/dsa-hp-tools':
+	#		content => "Package: hp-health\nPin: version 10.0.*\nPin-Priority: 1100\n"
+	#	}
 	} else {
 		file { '/etc/apt/preferences.d/dsa-hp-tools':
 			ensure => absent
@@ -12,4 +16,8 @@ class hardware {
 	}
 
 	include hardware::sensors
+
+	include hardware::fixes
+
+	include hardware::intel
 }