new onionbalance config generation, 2

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

diff --git a/modules/onion/manifests/balance_service.pp b/modules/onion/manifests/balance_service.pp
index 9348692..89be79b 100644 (file)
--- a/modules/onion/manifests/balance_service.pp
+++ b/modules/onion/manifests/balance_service.pp
@@ -2,7 +2,7 @@ define onion::balance_service (
 ) {
        include onion::balance
 
-       $onion_hn = onionbalance_hostname($name)
+       $onion_hn = onion_balance_service_hostname($name)
        if ! $onion_hn {
                exec { "create-onionbalance-key-${name}":
                        command => "/bin/true && umask 0027 && openssl genrsa -out /etc/onionbalance/private_keys/${name}.key 1024 && chgrp onionbalance /etc/onionbalance/private_keys/${name}.key",
@@ -12,7 +12,7 @@ define onion::balance_service (
        }
 
        concat::fragment { "onion::balance::service_header::${name}":
-               target  => "/etc/onionbalance/config",
+               target  => "/etc/onionbalance/config.yaml",
                order   => "50-${name}-10",
                content => "  - # ${name} via ${onion_hn}\n    key: private_keys/${name}.key\n    instances:\n",
        }