From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 14:00:24 +0000 (+0000)
Subject: rename onion facts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=705850831e5b2cea9d62f92bb6d234e87572e326;p=mirror%2Fdsa-puppet.git

rename onion facts
---

diff --git a/modules/debian-org/lib/facter/onion-services.rb b/modules/debian-org/lib/facter/onion-services.rb
index 8222df428..af60d10db 100644
--- a/modules/debian-org/lib/facter/onion-services.rb
+++ b/modules/debian-org/lib/facter/onion-services.rb
@@ -1,7 +1,7 @@
 begin
     require 'json'
 
-    Facter.add("onion_hostname") do
+    Facter.add("onion_tor_service_hostname") do
         services = {}
 
         Dir['/var/lib/tor/onion/*/hostname'].each do |p|
@@ -15,7 +15,7 @@ begin
         end
     end
 
-    Facter.add("onionbalance_hostname") do
+    Facter.add("onion_balance_service_hostname") do
         services = {}
 
         Dir['/etc/onionbalance/private_keys/*.key'].each do |p|
diff --git a/modules/onion/manifests/balance_service.pp b/modules/onion/manifests/balance_service.pp
index 56131d6a4..89be79b52 100644
--- 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",
diff --git a/modules/onion/manifests/service.pp b/modules/onion/manifests/service.pp
index 08b892a02..71e8b6684 100644
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -11,7 +11,7 @@ define onion::service (
 		content => "HiddenServiceDir /var/lib/tor/onion/${name}\nHiddenServicePort ${port} ${target_address}:${target_port}\n\n",
 	}
 
-	$onion_hn = onion_hostname($name)
+	$onion_hn = onion_tor_service_hostname($name)
 	if $onion_hn {
 		$hostname_without_onion = regsubst($onion_hn, '\.onion$', '')
 		@@concat::fragment { "onion::balance::instance::$name::$fqdn":
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onion_balance_service_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onion_balance_service_hostname.rb
new file mode 100644
index 000000000..75cb033d7
--- /dev/null
+++ b/modules/puppetmaster/lib/puppet/parser/functions/onion_balance_service_hostname.rb
@@ -0,0 +1,14 @@
+module Puppet::Parser::Functions
+  newfunction(:onion_balance_service_hostname, :type => :rvalue) do |args|
+    servicename = args.shift()
+
+    onion_balance_service_hostname_fact = lookupvar('onion_balance_service_hostname')
+
+    require 'json'
+    parsed = JSON.parse(onion_balance_service_hostname_fact)
+    return parsed[servicename]
+  end
+end
+# vim:set ts=2:
+# vim:set et:
+# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onion_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onion_hostname.rb
deleted file mode 100644
index b0d15a615..000000000
--- a/modules/puppetmaster/lib/puppet/parser/functions/onion_hostname.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:onion_hostname, :type => :rvalue) do |args|
-    servicename = args.shift()
-
-    onion_hostname_fact = lookupvar('onion_hostname')
-
-    require 'json'
-    parsed = JSON.parse(onion_hostname_fact)
-    return parsed[servicename]
-  end
-end
-# vim:set ts=2:
-# vim:set et:
-# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onion_tor_service_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onion_tor_service_hostname.rb
new file mode 100644
index 000000000..4d17eb298
--- /dev/null
+++ b/modules/puppetmaster/lib/puppet/parser/functions/onion_tor_service_hostname.rb
@@ -0,0 +1,14 @@
+module Puppet::Parser::Functions
+  newfunction(:onion_tor_service_hostname, :type => :rvalue) do |args|
+    servicename = args.shift()
+
+    onion_tor_service_hostname_fact = lookupvar('onion_tor_service_hostname')
+
+    require 'json'
+    parsed = JSON.parse(onion_tor_service_hostname_fact)
+    return parsed[servicename]
+  end
+end
+# vim:set ts=2:
+# vim:set et:
+# vim:set shiftwidth=2:
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/onionbalance_hostname.rb b/modules/puppetmaster/lib/puppet/parser/functions/onionbalance_hostname.rb
deleted file mode 100644
index b43b1d639..000000000
--- a/modules/puppetmaster/lib/puppet/parser/functions/onionbalance_hostname.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:onionbalance_hostname, :type => :rvalue) do |args|
-    servicename = args.shift()
-
-    onionbalance_hostname_fact = lookupvar('onionbalance_hostname')
-
-    require 'json'
-    parsed = JSON.parse(onionbalance_hostname_fact)
-    return parsed[servicename]
-  end
-end
-# vim:set ts=2:
-# vim:set et:
-# vim:set shiftwidth=2: