Note that exim contains tracker-specific configuration

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

diff --git a/modules/onion/manifests/balance.pp b/modules/onion/manifests/balance.pp
index 7d8c3b8..d3f5ba8 100644 (file)
--- a/modules/onion/manifests/balance.pp
+++ b/modules/onion/manifests/balance.pp
@@ -8,6 +8,13 @@ class onion::balance {
                ensure => running,
                require => Package['onionbalance'],
        }
+       dsa_systemd::override { 'onionbalance':
+               ensure => $ensure,
+               content => @(EOT)
+                       [Unit]
+                       BindsTo=tor.service
+                       | EOT
+       }
 
        file { '/usr/local/bin/tor-onion-name':
                mode    => '0555',
@@ -21,27 +28,16 @@ class onion::balance {
 
        concat::fragment { 'onion::torrc_control_header':
                target  => "/etc/tor/torrc",
-               order   => 10,
+               order   => '10',
                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']
@@ -51,8 +47,7 @@ class onion::balance {
        exec { "create-onionbalance-config":
                command => "/usr/local/bin/create-onionbalance-config",
                refreshonly => true,
-               require => [  File['/usr/local/bin/create-onionbalance-config'] ],
-               #require => Package['onionbalance'],
-               #notify  => Service['onionbalance'],
+               require => [ File['/usr/local/bin/create-onionbalance-config'], Package['onionbalance'] ],
+               notify  => Service['onionbalance'],
        }
 }