buildd: make sure the buildd service is disabled and not running

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

diff --git a/modules/onion/manifests/balance.pp b/modules/onion/manifests/balance.pp
index 3d01e88..600aa24 100644 (file)
--- a/modules/onion/manifests/balance.pp
+++ b/modules/onion/manifests/balance.pp
@@ -16,6 +16,7 @@ class onion::balance {
        file { '/usr/local/bin/create-onionbalance-config':
                mode    => '0555',
                source  => 'puppet:///modules/onion/create-onionbalance-config',
+               notify  => Exec['create-onionbalance-config'],
        }
 
        concat::fragment { 'onion::torrc_control_header':
@@ -24,23 +25,12 @@ class onion::balance {
                content => "ControlPort 9051\n\n",
        }
 
-       concat { '/etc/onionbalance/config.yaml':
-               notify  => Service['onionbalance'],
-               require => Package['onionbalance'],
-       }
-       concat::fragment { 'onion::balance::config_header':
-               target  => "/etc/onionbalance/config.yaml",
-               order   => 05,
-               content => "services:\n",
-       }
-
        @@concat::fragment { "onion::balance::onionbalance-services.yaml":
                target  => "/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml",
                content => "${onion_balance_service_hostname}\n",
                tag     => "onionbalance-services.yaml",
        }
 
-
        concat { '/etc/onionbalance/config-dsa-snippet.yaml':
                notify  => Exec['create-onionbalance-config'],
                require => File['/usr/local/bin/create-onionbalance-config']
@@ -48,8 +38,9 @@ class onion::balance {
        Concat::Fragment <<| tag == "onion::balance::dsa-snippet" |>>
 
        exec { "create-onionbalance-config":
-               command => "/usr/local/bin/create-onionbalance-config"
+               command => "/usr/local/bin/create-onionbalance-config",
                refreshonly => true,
-               require =>  File['/usr/local/bin/create-onionbalance-config']
+               require => [ File['/usr/local/bin/create-onionbalance-config'], Package['onionbalance'] ],
+               notify  => Service['onionbalance'],
        }
 }