Template: saned.conf.erb

diff --git a/manifests/subsystem/scanner.pp b/manifests/subsystem/scanner.pp
index 021b70c5f9d0c9b98aa0075880d6e1e2ef8a0bd3..8b916b03535d2a5ad30ee66deb3d88aa84f5eb99 100644 (file)
--- a/manifests/subsystem/scanner.pp
+++ b/manifests/subsystem/scanner.pp
@@ -1,4 +1,4 @@
-class nodo::subsystem::scanner {
+class nodo::subsystem::scanner($access_list = hiera('nodo::subsystem::scanner::access_list', '')) {
   package { 'sane':
     ensure  => present,
   }
@@ -39,7 +39,7 @@ class nodo::subsystem::scanner {
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    source  => 'puppet:///modules/nodo/etc/sane.d/saned.conf',
+    content => template('nodo/sane.d/saned.conf.erb'),
     require => Package['sane'],
   }
 

diff --git a/files/etc/sane.d/saned.conf b/templates/sane.d/saned.conf.erb
similarity index 98%
rename from files/etc/sane.d/saned.conf
rename to templates/sane.d/saned.conf.erb
index f61de7ab70a77c7337a4ee878c4cfe6237adf3c1..38ca9ed371f57eec87293467496a21ed9060ac3a 100644 (file)
--- a/files/etc/sane.d/saned.conf
+++ b/templates/sane.d/saned.conf.erb
@@ -25,7 +25,7 @@ data_portrange = 10000 - 10100
 #192.168.0.1/29
 #[2001:7a8:185e::42:12]
 #[2001:7a8:185e::42:12]/64
-192.168.1.0/24
+<%= access_list %>
 
 # NOTE: /etc/inetd.conf (or /etc/xinetd.conf) and
 # /etc/services must also be properly configured to start