X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fonion%2Fmanifests%2Fbalance.pp;h=3d01e881aac966b43e285a2d043193edad20ccfe;hb=389619af31c9e8a1a67a787b61c671a9b34a40f6;hp=1c0f9d3f3b8c66e49d0420e1c13602ea157ab051;hpb=8d9666e63a8876fa5e85964fe5c1de8d849a9fe3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/onion/manifests/balance.pp b/modules/onion/manifests/balance.pp
index 1c0f9d3f3..3d01e881a 100644
--- a/modules/onion/manifests/balance.pp
+++ b/modules/onion/manifests/balance.pp
@@ -13,6 +13,10 @@ class onion::balance {
 		mode    => '0555',
 		source  => 'puppet:///modules/onion/tor-onion-name',
 	}
+	file { '/usr/local/bin/create-onionbalance-config':
+		mode    => '0555',
+		source  => 'puppet:///modules/onion/create-onionbalance-config',
+	}
 
 	concat::fragment { 'onion::torrc_control_header':
 		target  => "/etc/tor/torrc",
@@ -20,13 +24,32 @@ class onion::balance {
 		content => "ControlPort 9051\n\n",
 	}
 
-	concat { '/etc/onionbalance/config':
+	concat { '/etc/onionbalance/config.yaml':
 		notify  => Service['onionbalance'],
 		require => Package['onionbalance'],
 	}
 	concat::fragment { 'onion::balance::config_header':
-		target  => "/etc/onionbalance/config",
+		target  => "/etc/onionbalance/config.yaml",
 		order   => 05,
-		content => "service:\n",
+		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']
+	}
+	Concat::Fragment <<| tag == "onion::balance::dsa-snippet" |>>
+
+	exec { "create-onionbalance-config":
+		command => "/usr/local/bin/create-onionbalance-config"
+		refreshonly => true,
+		require =>  File['/usr/local/bin/create-onionbalance-config']
 	}
 }