aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-05-30 22:58:30 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-05-30 22:58:30 -0300
commit9d0bb54276ee846440a71798c65941502a1c10db (patch)
tree7be6f9f885ca422f415931df85a5c5be838bf021
parent71a735a938f588ca8fdf452a526006412241da10 (diff)
downloadpuppet-nodo-9d0bb54276ee846440a71798c65941502a1c10db.tar.gz
puppet-nodo-9d0bb54276ee846440a71798c65941502a1c10db.tar.bz2
Parametrizing firewall::nas
-rw-r--r--manifests/role/nas.pp33
1 files changed, 29 insertions, 4 deletions
diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp
index 428f23b..bae8b66 100644
--- a/manifests/role/nas.pp
+++ b/manifests/role/nas.pp
@@ -2,9 +2,6 @@ class nodo::role::nas {
# Minimal utilities
include nodo::utils::network::minimal
- # Firewall rules
- include firewall::nas
-
# Media folders and groups
include nodo::subsystem::media
@@ -27,7 +24,11 @@ class nodo::role::nas {
# http://lists.freedesktop.org/archives/avahi/2006-July/000824.html
# http://cups.org/documentation.php/doc-1.6/ref-cupsd-conf.html#BrowseLocalProtocols
# http://www.dns-sd.org/ServiceTypes.html
- include avahi
+ $avahi = hiera('nodo::role::nas::avahi', false)
+
+ if $avahi == true {
+ include avahi
+ }
# DLNA
$dlna = hiera('nodo::role::nas::dlna', false)
@@ -234,6 +235,15 @@ class nodo::role::nas {
}
#
+ # Torrent
+ #
+ $torrent = hiera('nodo::role::nas::torrent', false)
+
+ if $torrent == true {
+ include pyroscope
+ }
+
+ #
# DAAP
#
# References
@@ -249,4 +259,19 @@ class nodo::role::nas {
# music_dir => '/var/cache/media/noise',
# }
#}
+
+ # Firewall rules
+ class { 'firewall::nas':
+ ftp => $ftp,
+ tftp => $tftp,
+ http => $http,
+ nfsd => $nfs,
+ rsync => $rsync,
+ printer => $cups,
+ torrent => $torrent,
+ mpd => $mpd,
+ samba => $samba,
+ dlna => $dlna,
+ #daap => $daap,
+ }
}