rename hidden service to onion service to follow the new naming conventions

3 files changed, 14 insertions, 14 deletions

diff --git a/README b/README
index bf2968d..3b6c524 100644
--- a/README
+++ b/README
@@ -169,7 +169,7 @@ Configuring hidden services
 
 To configure a tor hidden service you can do something like the following:
 
- tor::daemon::hidden_service { "hidden_ssh": ports => 22 }
+ tor::daemon::onion_service { "onion_ssh": ports => 22 }
 
 The HiddenServiceDir is set to the ${data_dir}/${name}.
 
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/onions_service.pp
index 1519b56..2625521 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/manifests/daemon/onions_service.pp
@@ -1,5 +1,5 @@
-# hidden services definition
-define tor::daemon::hidden_service(
+# onion services definition
+define tor::daemon::onion_service(
   $ensure                 = present,
   $ports                  = [],
   $data_dir               = $tor::daemon::data_dir,
@@ -10,9 +10,9 @@ define tor::daemon::hidden_service(
 
   $data_dir_path = "${data_dir}/${name}"
   include ::tor::daemon::params
-  concat::fragment { "05.hidden_service.${name}":
+  concat::fragment { "05.onion_service.${name}":
     ensure  => $ensure,
-    content => template('tor/torrc.hidden_service.erb'),
+    content => template('tor/torrc.onion_service.erb'),
     order   => '05',
     target  => $tor::daemon::config_file,
   }
diff --git a/spec/defines/daemon_hidden_service_spec.rb b/spec/defines/daemon_onion_service_spec.rb
index 7a3aae6..bf9641d 100644
--- a/spec/defines/daemon_hidden_service_spec.rb
+++ b/spec/defines/daemon_onion_service_spec.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
 require 'openssl'
 
-describe 'tor::daemon::hidden_service', :type => 'define' do
+describe 'tor::daemon::onion_service', :type => 'define' do
   let(:default_facts) {
     {
       :osfamily        => 'RedHat',
@@ -15,13 +15,13 @@ describe 'tor::daemon::hidden_service', :type => 'define' do
   describe 'with standard' do
     it { is_expected.to compile.with_all_deps }
 
-    it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with(
+    it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with(
       :ensure  => 'present',
       :content => /HiddenServiceDir \/var\/lib\/tor\/test_os/,
       :order   => '05',
       :target  => '/etc/tor/torrc',
     )}
-    it { is_expected.to_not contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort/) }
+    it { is_expected.to_not contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort/) }
     it { is_expected.to_not contain_file('/var/lib/tor/test_os') }
     context 'on Debian' do
       let(:facts) {
@@ -31,13 +31,13 @@ describe 'tor::daemon::hidden_service', :type => 'define' do
         }
       }
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with(
+      it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with(
         :ensure  => 'present',
         :content => /HiddenServiceDir \/var\/lib\/tor\/test_os/,
         :order   => '05',
         :target  => '/etc/tor/torrc',
       )}
-      it { is_expected.to_not contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort/) }
+      it { is_expected.to_not contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort/) }
       it { is_expected.to_not contain_file('/var/lib/tor/test_os') }
     end
     context 'with differt port params' do
@@ -47,8 +47,8 @@ describe 'tor::daemon::hidden_service', :type => 'define' do
         }
       }
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort 25 127.0.0.1:25/) }
-      it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort 443 192.168.0.1:8443/) }
+      it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort 25 127.0.0.1:25/) }
+      it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort 443 192.168.0.1:8443/) }
       it { is_expected.to_not contain_file('/var/lib/tor/test_os') }
     end
     context 'with private_key' do
@@ -59,7 +59,7 @@ describe 'tor::daemon::hidden_service', :type => 'define' do
         }
       }
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort 80 127.0.0.1:80/) }
+      it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort 80 127.0.0.1:80/) }
       it { is_expected.to contain_file('/var/lib/tor/test_os').with(
         :ensure  => 'directory',
         :purge   => true,
@@ -93,7 +93,7 @@ describe 'tor::daemon::hidden_service', :type => 'define' do
         }
       }
       it { is_expected.to compile.with_all_deps }
-      it { is_expected.to contain_concat__fragment('05.hidden_service.test_os').with_content(/^HiddenServicePort 80 127.0.0.1:80/) }
+      it { is_expected.to contain_concat__fragment('05.onion_service.test_os').with_content(/^HiddenServicePort 80 127.0.0.1:80/) }
       it { is_expected.to contain_file('/var/lib/tor/test_os').with(
         :ensure  => 'directory',
         :purge   => true,