diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-12-31 15:31:17 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-12-31 15:31:17 -0200 |
| commit | c8b19247f0fda2eb94f93a738db5d6aa319a75b2 (patch) | |
| tree | 5aed725f260ebd12eb0eedff02f1ea3adc7e7de1 | |
| parent | f06d4f275a1774d28e815b5d5d03a0db85942d44 (diff) | |
| download | puppet-nodo-c8b19247f0fda2eb94f93a738db5d6aa319a75b2.tar.gz puppet-nodo-c8b19247f0fda2eb94f93a738db5d6aa319a75b2.tar.bz2 | |
Template: saned.conf.erb
| -rw-r--r-- | manifests/subsystem/scanner.pp | 4 | ||||
| -rw-r--r-- | templates/sane.d/saned.conf.erb (renamed from files/etc/sane.d/saned.conf) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/subsystem/scanner.pp b/manifests/subsystem/scanner.pp index 021b70c..8b916b0 100644 --- 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 index f61de7a..38ca9ed 100644 --- 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 |