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/base.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/base.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/base.pp | 77 +++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 puppet/modules/tor/manifests/daemon/base.pp

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

diff --git a/puppet/modules/tor/manifests/daemon/base.pp b/puppet/modules/tor/manifests/daemon/base.pp
new file mode 100644
index 00000000..63d7bc4d
--- /dev/null
+++ b/puppet/modules/tor/manifests/daemon/base.pp
@@ -0,0 +1,77 @@
+# extend basic tor things with a snippet based daemon configuration
+class tor::daemon::base inherits tor::base {
+  # packages, user, group
+  Service['tor'] {
+    subscribe => File[$tor::daemon::config_file],
+  }
+
+  Package[ 'tor' ] {
+    require => File[$tor::daemon::data_dir],
+  }
+
+  group { 'debian-tor':
+    ensure    => present,
+    allowdupe => false,
+  }
+
+  user { 'debian-tor':
+    ensure    => present,
+    allowdupe => false,
+    comment   => 'tor user,,,',
+    home      => $tor::daemon::data_dir,
+    shell     => '/bin/false',
+    gid       => 'debian-tor',
+    require   => Group['debian-tor'],
+  }
+
+  # directories
+  file { $tor::daemon::data_dir:
+    ensure  => directory,
+    mode    => '0700',
+    owner   => 'debian-tor',
+    group   => 'debian-tor',
+    require => User['debian-tor'],
+  }
+
+  file { '/etc/tor':
+    ensure  => directory,
+    mode    => '0755',
+    owner   => 'debian-tor',
+    group   => 'debian-tor',
+    require => User['debian-tor'],
+  }
+
+  file { '/var/lib/puppet/modules/tor':
+    ensure  => absent,
+    recurse => true,
+    force   => true,
+  }
+
+  # tor configuration file
+  concat { $tor::daemon::config_file:
+    mode   => '0600',
+    owner  => 'debian-tor',
+    group  => 'debian-tor',
+  }
+
+  # config file headers
+  concat::fragment { '00.header':
+    ensure  => present,
+    content => template('tor/torrc.header.erb'),
+    owner   => 'debian-tor',
+    group   => 'debian-tor',
+    mode    => '0644',
+    order   => 00,
+    target  => $tor::daemon::config_file,
+  }
+
+  # global configurations
+  concat::fragment { '01.global':
+    content => template('tor/torrc.global.erb'),
+    owner   => 'debian-tor',
+    group   => 'debian-tor',
+    mode    => '0644',
+    order   => 01,
+    target  => $tor::daemon::config_file,
+  }
+}
-- 
cgit v1.2.3