Make concat::fragment order parameter be a string

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

diff --git a/modules/onion/manifests/service.pp b/modules/onion/manifests/service.pp
index b025f67..77ecc89 100644 (file)
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -19,7 +19,7 @@ define onion::service (
 
                concat::fragment { "onion::torrc_onionservice::${name}":
                        target  => "/etc/tor/torrc",
-                       order   => 50,
+                       order   => '50',
                        content => "HiddenServiceDir /var/lib/tor/onion/${name}\nHiddenServicePort ${port} ${target_address}:${target_port}\n\n",
                }
 
@@ -29,7 +29,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",
                                }
@@ -41,5 +41,12 @@ define onion::service (
                                }
                        }
                }
+       } elsif ($my_ensure == "absent") {
+               file { "/var/lib/tor/onion/${name}":
+                       ensure => absent,
+                       force  => true,
+               }
+       } else {
+               fail("Invalid ensure value ${my_ensure}")
        }
 }