summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-01-02 17:24:45 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-01-02 17:24:45 -0300
commit4b332c70cfe6fba2513ba26aad37ab61092a7fac (patch)
tree115ab6b442108c03d572f6788cbbe3c493e657ca
parent9eb3afad9b80093760e45cd1f05422c7f3d5d380 (diff)
downloadpuppet-onion-4b332c70cfe6fba2513ba26aad37ab61092a7fac.tar.gz
puppet-onion-4b332c70cfe6fba2513ba26aad37ab61092a7fac.tar.bz2
Fix: small refactor; remove freenode class
-rw-r--r--manifests/freenode.pp11
-rw-r--r--manifests/full.pp3
-rw-r--r--manifests/init.pp2
3 files changed, 2 insertions, 14 deletions
diff --git a/manifests/freenode.pp b/manifests/freenode.pp
deleted file mode 100644
index 623597d..0000000
--- a/manifests/freenode.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class onion::freenode inherits onion::socks {
- # Freenode via Tor
- # http://freenode.net/irc_servers.shtml
- # http://pthree.org/2010/01/31/freenode-ssl-and-sasl-authentication-with-irssi/
- # http://freenode.net/sasl/sasl-irssi.shtml
- # https://wiki.archlinux.org/index.php/Tor
- tor::daemon::map_address { 'freenode':
- address => '10.40.40.40',
- newaddress => 'frxleqtzgvwkv7oz.onion',
- }
-}
diff --git a/manifests/full.pp b/manifests/full.pp
index 14be354..d54cc14 100644
--- a/manifests/full.pp
+++ b/manifests/full.pp
@@ -1,4 +1,4 @@
-class onion::full inherits onion::freenode {
+class onion::full inherits onion::socks {
include onion::ssh
package { 'polipo':
@@ -12,5 +12,4 @@ class onion::full inherits onion::freenode {
# }
# default: { }
#}
-
}
diff --git a/manifests/init.pp b/manifests/init.pp
index d049178..40a0ae5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,7 +5,7 @@ class onion {
# to ease backup/restore procedures as we don't mix
# hidden service data with other tor files.
file { "${tor::daemon::data_dir}/hidden":
- ensure => directory,
+ ensure => directory,
owner => 'debian-tor',
group => 'debian-tor',
mode => '0700',