Fix: small refactor; remove freenode class

diff --git a/manifests/freenode.pp b/manifests/freenode.pp
deleted file mode 100644 (file)
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 14be354429a911b6744a773cbaaa6578ea5419d7..d54cc1439d46c785576ace085606ebd445f8265c 100644 (file)
--- 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 d04917832901557bf916789d9a5d7dcb9f7a527b..40a0ae5aab9dad7b6362293baa484da08a9b3279 100644 (file)
--- 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',