no longer require manual configuration of all onionbalancers

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

diff --git a/modules/onion/manifests/service.pp b/modules/onion/manifests/service.pp
index 726f6c8..b025f67 100644 (file)
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -1,23 +1,45 @@
 define onion::service (
        $port,
        $target_address,
-       $target_port
+       $target_port,
+       $ensure = present,
+       $direct = false
 ) {
-       include onion
-
-       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",
+       if ($ensure == "ifstatic") {
+               $my_ensure = has_static_component($name) ? {
+                       true => "present",
+                       false => "absent"
+               }
+       } else {
+               $my_ensure = $ensure
        }
 
-       $onion_hn = onion_hostname($name)
-       if $onion_hn {
-               @@concat::fragment { "onion::balance::instance::$name::$fqdn":
-                       target  => "/etc/onionbalance/config.yaml",
-                       content => "      - address: ${onion_hn}\n        name: ${hostname}-${name}\n",
-                       order   => "50-${name}-20",
-                       tag     => "onion::balance::$name",
+       if ($my_ensure == "present") {
+               include onion
+
+               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",
+               }
+
+               $onion_hn = onion_tor_service_hostname($name)
+               if $onion_hn {
+                       $hostname_without_onion = regsubst($onion_hn, '\.onion$', '')
+
+                       if ($direct) {
+                               @@concat::fragment { "onion::balance::onionbalance-services.yaml::${name}":
+                                       target  => "/srv/puppet.torproject.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 => "- service: ${name}\n  address: ${hostname_without_onion}\n  name: ${hostname}-${name}\n",
+                                       tag     => "onion::balance::dsa-snippet",
+                               }
+                       }
                }
        }
 }