site.pp: Add cups_browsed_polling class and enable it where appropriate.HEADmaster

1 files changed, 57 insertions, 0 deletions

diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 0d0009c..5591886 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -62,6 +62,57 @@ class ssh_pubkeys_backupserver {
 	}
 }
 
+class cups_browsed_polling {
+
+	exec { 'cups-browsed-reload':
+		command     => '/usr/sbin/service cups-browsed restart',
+		subscribe   => [File_line['cups-browsed-create-remote-cups-printers'], File_line['cups-browsed-poll-ipp-intern'], File_line['cups-browsed-queue-naming'], File_line['cups-browsed-no-remote-protos'], File_line['cups-browsed-no-local-protos']],
+		refreshonly => true,
+	}
+
+	exec { 'cups-delete-dead-printers':
+		command     => '/bin/bash -c "LANG=C lpstat -a | grep \"not accepting requests\" | cut -d \" \" -f1 | while read printer; do lpadmin -x \$printer; done"',
+		subscribe   => File_line['cups-browsed-no-remote-protos'],
+		refreshonly => true,
+	}
+
+	file_line { 'cups-browsed-create-remote-cups-printers':
+		path               => '/etc/cups/cups-browsed.conf',
+		ensure             => present,
+		line               => "CreateRemoteCUPSPrinterQueues Yes",
+		match              => '^CreateRemoteCUPSPrinterQueues.*',
+	}
+
+	file_line { 'cups-browsed-no-remote-protos':
+		path               => '/etc/cups/cups-browsed.conf',
+		ensure             => present,
+		line               => "BrowseRemoteProtocols none",
+		match              => '^BrowseRemoteProtocols.*',
+	}
+
+	file_line { 'cups-browsed-no-local-protos':
+		path               => '/etc/cups/cups-browsed.conf',
+		ensure             => present,
+		line               => "BrowseLocalProtocols none",
+		match              => '^BrowseLocalProtocols.*',
+	}
+
+	file_line { 'cups-browsed-queue-naming':
+		path               => '/etc/cups/cups-browsed.conf',
+		ensure             => present,
+		line               => "LocalQueueNamingRemoteCUPS RemoteName",
+		match              => '^LocalQueueNamingRemoteCUPS.*',
+	}
+
+	file_line { 'cups-browsed-poll-ipp-intern':
+		path               => '/etc/cups/cups-browsed.conf',
+		ensure             => present,
+		line               => "BrowsePoll ipp.intern",
+		match              => '^BrowsePoll\ .*',
+		append_on_no_match => true,
+	}
+}
+
 class lsb_release_with_version {
 	file { '/etc/lsb-release':
 		ensure => present,
@@ -176,6 +227,7 @@ node "disklserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 	class { 'krb5hostkeytab': }
 }
 
@@ -216,6 +268,7 @@ node "faiserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 	class { 'krb5hostkeytab': }
 }
 
@@ -236,6 +289,7 @@ node "filter.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 	class { 'krb5hostkeytab': }
 }
 
@@ -257,6 +311,7 @@ node "opsiserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 # NOT PRESENT node "displayserver.intern" inherits "all_servers" {}
 # NOT PRESENT node "contentserver.intern" inherits "all_servers" {}
@@ -278,6 +333,7 @@ node "default" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 
 # Changes for testing cachfilesd-stuff below (node)
@@ -298,5 +354,6 @@ node "test-workstation.intern" {
 		},
 	}
 	class { 'cachefilesd': }
+	class { 'cups_browsed_polling': }
 	class { 'krb5hostkeytab': }
 }