Adding mail::hidden for tor hidden services support

diff --git a/manifests/hidden.pp b/manifests/hidden.pp
new file mode 100644 (file)
index 0000000..bdddcf2
--- /dev/null
+++ b/manifests/hidden.pp
@@ -0,0 +1,22 @@
+class mail::hidden {
+  # Make sure that the tor daemon is included
+  include tor::daemon
+
+  # It's important to use a subdir from the tor datadir
+  # to ease backup/restore procedures as we don't mix
+  # hidden service data with other tor files.
+  if !defined(File["$tor::daemon::data_dir/hidden"]) {
+    file { "$tor::daemon::data_dir/hidden":
+      ensure => directory, 
+      owner  => 'debian-tor',
+      group  => 'debian-tor',
+      mode   => 0700,
+    }
+  }
+
+  tor::daemon::hidden_service { 'mail':
+    ports    => [ '80 127.0.0.1:80', '25 127.0.0.1:25', '993 127.0.0.1:993' ],
+    data_dir => "$tor::daemon::data_dir/hidden",
+    require  => File["$tor::daemon::data_dir/hidden"],
+  }
+}

diff --git a/manifests/init.pp b/manifests/init.pp
index fc1824fe35dcfd6f424bdf259376c8d5ebbba978..9c2a490ab08254b11a7119e8080f91361436ce8a 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,3 +16,4 @@ import "base.pp"
 import "spamassassin.pp"
 import "firma.pp"
 import "mlmmj.pp"
+import "hidden.pp"