From d91d70dd378a4a91c740b03b0852432ef128b24a Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 4 Nov 2016 18:52:39 +0100
Subject: store key & hostname

---
 manifests/daemon/onion_service.pp  | 56 ++++++++++++++++++++++++++++++++++++++
 manifests/daemon/onions_service.pp | 56 --------------------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 manifests/daemon/onion_service.pp
 delete mode 100644 manifests/daemon/onions_service.pp

(limited to 'manifests')

diff --git a/manifests/daemon/onion_service.pp b/manifests/daemon/onion_service.pp
new file mode 100644
index 0000000..2625521
--- /dev/null
+++ b/manifests/daemon/onion_service.pp
@@ -0,0 +1,56 @@
+# onion services definition
+define tor::daemon::onion_service(
+  $ensure                 = present,
+  $ports                  = [],
+  $data_dir               = $tor::daemon::data_dir,
+  $private_key            = undef,
+  $private_key_name       = $name,
+  $private_key_store_path = undef,
+) {
+
+  $data_dir_path = "${data_dir}/${name}"
+  include ::tor::daemon::params
+  concat::fragment { "05.onion_service.${name}":
+    ensure  => $ensure,
+    content => template('tor/torrc.onion_service.erb'),
+    order   => '05',
+    target  => $tor::daemon::config_file,
+  }
+  if $private_key or ($private_key_name and $private_key_store_path) {
+    if $private_key and ($private_key_name and $private_key_store_path) {
+      fail("Either private_key OR (private_key_name AND private_key_store_path) must be set, but not all three of them")
+    }
+    if $private_key_store_path and $private_key_name {
+      $tmp = generate_onion_key($private_key_store_path,$private_key_name)
+      $os_hostname = $tmp[0]
+      $real_private_key = $tmp[1]
+    } else {
+      $os_hostname = onion_address($private_key)
+      $real_private_key = $private_key
+    }
+    file{
+      $data_dir_path:
+        ensure  => directory,
+        purge   => true,
+        force   => true,
+        recurse => true,
+        owner   => $tor::daemon::params::user,
+        group   => $tor::daemon::params::group,
+        mode    => '0600',
+        require => Package['tor'];
+      "${data_dir_path}/private_key":
+        content => $real_private_key,
+        owner   => $tor::daemon::params::user,
+        group   => $tor::daemon::params::group,
+        mode    => '0600',
+        notify  => Service['tor'];
+      "${data_dir_path}/hostname":
+        content => "${os_hostname}.onion\n",
+        owner   => $tor::daemon::params::user,
+        group   => $tor::daemon::params::group,
+        mode    => '0600',
+        notify  => Service['tor'];
+    }
+  }
+}
+
diff --git a/manifests/daemon/onions_service.pp b/manifests/daemon/onions_service.pp
deleted file mode 100644
index 2625521..0000000
--- a/manifests/daemon/onions_service.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-# onion services definition
-define tor::daemon::onion_service(
-  $ensure                 = present,
-  $ports                  = [],
-  $data_dir               = $tor::daemon::data_dir,
-  $private_key            = undef,
-  $private_key_name       = $name,
-  $private_key_store_path = undef,
-) {
-
-  $data_dir_path = "${data_dir}/${name}"
-  include ::tor::daemon::params
-  concat::fragment { "05.onion_service.${name}":
-    ensure  => $ensure,
-    content => template('tor/torrc.onion_service.erb'),
-    order   => '05',
-    target  => $tor::daemon::config_file,
-  }
-  if $private_key or ($private_key_name and $private_key_store_path) {
-    if $private_key and ($private_key_name and $private_key_store_path) {
-      fail("Either private_key OR (private_key_name AND private_key_store_path) must be set, but not all three of them")
-    }
-    if $private_key_store_path and $private_key_name {
-      $tmp = generate_onion_key($private_key_store_path,$private_key_name)
-      $os_hostname = $tmp[0]
-      $real_private_key = $tmp[1]
-    } else {
-      $os_hostname = onion_address($private_key)
-      $real_private_key = $private_key
-    }
-    file{
-      $data_dir_path:
-        ensure  => directory,
-        purge   => true,
-        force   => true,
-        recurse => true,
-        owner   => $tor::daemon::params::user,
-        group   => $tor::daemon::params::group,
-        mode    => '0600',
-        require => Package['tor'];
-      "${data_dir_path}/private_key":
-        content => $real_private_key,
-        owner   => $tor::daemon::params::user,
-        group   => $tor::daemon::params::group,
-        mode    => '0600',
-        notify  => Service['tor'];
-      "${data_dir_path}/hostname":
-        content => "${os_hostname}.onion\n",
-        owner   => $tor::daemon::params::user,
-        group   => $tor::daemon::params::group,
-        mode    => '0600',
-        notify  => Service['tor'];
-    }
-  }
-}
-
-- 
cgit v1.2.3