Tweak/nearly disable CUPS clients' browse polling.

1 files changed, 51 insertions, 0 deletions

diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 64845ae..e588da2 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -153,6 +153,43 @@ class ldapservercert_renewal {
 	}
 }
 
+class cups_browsed_polling {
+	exec { 'cups-browsed-reload':
+		command     => '/usr/sbin/service cups-browsed restart',
+		subscribe   => [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,
+	}
+
+	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 itzks_systems_common {
 	package { 'itzks-systems-common':
 		ensure => 'latest',
@@ -270,6 +307,7 @@ node "disklserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 
 node "tjener.intern" {
@@ -312,6 +350,7 @@ node "faiserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 
 node "filter.intern" {
@@ -333,6 +372,7 @@ node "filter.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 
 # NOT PRESENT node "opsiserver.intern" inherits "all_servers" {}
@@ -355,6 +395,7 @@ node "contentserver.intern" {
 			debdelta => 1,
 		},
 	}
+	class { 'cups_browsed_polling': }
 }
 node "devserver.intern" {
 	class { 'ssh_pubkeys_admins': }
@@ -375,6 +416,7 @@ node "devserver.intern" {
 		},
 	}
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 node "bibserv.intern" {
 	class { 'ssh_pubkeys_admins': }
@@ -396,6 +438,7 @@ node "bibserv.intern" {
 	}
 	class { 'browsers': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 # Notebooks in den Medienwagen
@@ -424,6 +467,7 @@ node /^mw.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^nbw.*\.intern$/ {
@@ -449,6 +493,7 @@ node /^nbw.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^net.*\.intern$/ {
@@ -474,6 +519,7 @@ node /^net.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^snb.*\.intern$/ {
@@ -499,6 +545,7 @@ node /^snb.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^t410.*\.intern$/ {
@@ -524,6 +571,7 @@ node /^t410.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^t61.*\.intern$/ {
@@ -549,6 +597,7 @@ node /^t61.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 node /^tp.*\.intern$/ {
@@ -574,6 +623,7 @@ node /^tp.*\.intern$/ {
 	class { 'browsers': }
 	class { 'cachefilesd': }
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }
 
 # default / minimal
@@ -594,4 +644,5 @@ node "default" {
 		},
 	}
 	class { 'ldapservercert_renewal': }
+	class { 'cups_browsed_polling': }
 }