From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 May 2016 12:52:57 +0200
Subject: update submodules so "rake test" doesnt complain anymore

---
 puppet/modules/tor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/tor/manifests/daemon/snippet.pp')

diff --git a/puppet/modules/tor b/puppet/modules/tor
index 8c936c16..9981a70f 160000
--- a/puppet/modules/tor
+++ b/puppet/modules/tor
@@ -1 +1 @@
-Subproject commit 8c936c166b6da1ebd0e8d95e56ceee5167357d63
+Subproject commit 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1
-- 
cgit v1.2.3


From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/tor | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/tor

(limited to 'puppet/modules/tor/manifests/daemon/snippet.pp')

diff --git a/puppet/modules/tor b/puppet/modules/tor
deleted file mode 160000
index 9981a70f..00000000
--- a/puppet/modules/tor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1
-- 
cgit v1.2.3


From 297fadc8e6ad4729589d4ec21683f05a1e50bdf9 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:46:13 -0400
Subject: git subrepo clone https://leap.se/git/puppet_tor puppet/modules/tor

subrepo:
  subdir:   "puppet/modules/tor"
  merged:   "9981a70"
upstream:
  origin:   "https://leap.se/git/puppet_tor"
  branch:   "master"
  commit:   "9981a70"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: I0a876a52bd83914cfd1e06abe9af208dd62e5683
---
 puppet/modules/tor/manifests/daemon/snippet.pp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 puppet/modules/tor/manifests/daemon/snippet.pp

(limited to 'puppet/modules/tor/manifests/daemon/snippet.pp')

diff --git a/puppet/modules/tor/manifests/daemon/snippet.pp b/puppet/modules/tor/manifests/daemon/snippet.pp
new file mode 100644
index 00000000..b9089b40
--- /dev/null
+++ b/puppet/modules/tor/manifests/daemon/snippet.pp
@@ -0,0 +1,16 @@
+# Arbitrary torrc snippet definition
+define tor::daemon::snippet(
+  $content = '',
+  $ensure  = present ) {
+
+  concat::fragment { "99.snippet.${name}":
+    ensure  => $ensure,
+    content => $content,
+    owner   => 'debian-tor',
+    group   => 'debian-tor',
+    mode    => '0644',
+    order   => 99,
+    target  => $tor::daemon::config_file,
+  }
+}
+
-- 
cgit v1.2.3