blacklist acpi power meter at csail

[mirror/dsa-puppet.git] / modules / onion / manifests / service.pp

diff --git a/modules/onion/manifests/service.pp b/modules/onion/manifests/service.pp
index 330add7..4f82299 100644 (file)
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -19,8 +19,13 @@ define onion::service (
 
                concat::fragment { "onion::torrc_onionservice::${name}":
                        target  => "/etc/tor/torrc",
-                       order   => 50,
-                       content => "HiddenServiceDir /var/lib/tor/onion/${name}\nHiddenServicePort ${port} ${target_address}:${target_port}\n\n",
+                       order   => '50',
+                       content  => @("EOF"),
+                               HiddenServiceDir /var/lib/tor/onion/${name}
+                               HiddenServiceVersion 2
+                               HiddenServicePort ${port} ${target_address}:${target_port}
+
+                               | EOF
                }
 
                $onion_hn = onion_tor_service_hostname($name)
@@ -29,7 +34,7 @@ define onion::service (
 
                        if ($direct) {
                                @@concat::fragment { "onion::balance::onionbalance-services.yaml::${name}":
-                                       target  => "/srv/puppet.torproject.org/puppet-facts/onionbalance-services.yaml",
+                                       target  => "/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml",
                                        content => "{\"${name}\": \"${onion_hn}\"}\n",
                                        tag     => "onionbalance-services.yaml",
                                }