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 c9870cc..4f82299 100644 (file)
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -19,33 +19,39 @@ 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)
                if $onion_hn {
                        $hostname_without_onion = regsubst($onion_hn, '\.onion$', '')
-                       @@concat::fragment { "onion::balance::instance::$name::$fqdn":
-                               target  => "/etc/onionbalance/config.yaml",
-                               content => "      - address: ${hostname_without_onion}\n        name: ${hostname}-${name}\n",
-                               order   => "50-${name}-20",
-                               tag     => "onion::balance::$name",
-                       }
 
                        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",
                                }
                        } else {
                                @@concat::fragment { "onion::balance::instance::dsa-snippet::$name::$fqdn":
                                        target  => "/etc/onionbalance/config-dsa-snippet.yaml",
-                                       content => "- instance: ${name}\n  address: ${hostname_without_onion}\n  host: ${hostname}-${name}\n",
+                                       content => "- service: ${name}\n  address: ${hostname_without_onion}\n  name: ${hostname}-${name}\n",
                                        tag     => "onion::balance::dsa-snippet",
                                }
                        }
                }
+       } elsif ($my_ensure == "absent") {
+               file { "/var/lib/tor/onion/${name}":
+                       ensure => absent,
+                       force  => true,
+               }
+       } else {
+               fail("Invalid ensure value ${my_ensure}")
        }
 }