diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2022-12-21 16:03:21 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2022-12-21 16:03:21 -0300 |
| commit | 7ba73570ea7c3a0936a617a1e92b8939984619e2 (patch) | |
| tree | 8e998c860c66e2901d06a19b37e5306bd875af90 | |
| parent | 93ce17804c95770c1193e31ef0b9fecb2cbeb679 (diff) | |
| download | puppet-nodo-7ba73570ea7c3a0936a617a1e92b8939984619e2.tar.gz puppet-nodo-7ba73570ea7c3a0936a617a1e92b8939984619e2.tar.bz2 | |
Fix: merge nodo::utils::tor into nodo::utils::network::tor
| -rw-r--r-- | manifests/role/tor.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/network/tor.pp | 12 | ||||
| -rw-r--r-- | manifests/utils/tor.pp | 9 |
3 files changed, 11 insertions, 12 deletions
diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp index 07ae5a0..cf6dc30 100644 --- a/manifests/role/tor.pp +++ b/manifests/role/tor.pp @@ -1,4 +1,4 @@ class nodo::role::tor inherits nodo::base::virtual { include tor::daemon - include nodo::utils::tor + include nodo::utils::network::tor } diff --git a/manifests/utils/network/tor.pp b/manifests/utils/network/tor.pp index 88c29ce..78b08a4 100644 --- a/manifests/utils/network/tor.pp +++ b/manifests/utils/network/tor.pp @@ -1,6 +1,8 @@ -# This class currently only manages the repository definition and key +# This class currently mostly manages the repository definition and key # Use the "tor" or "onion" modules to manage package installation and service configuration -class nodo::utils::network::tor { +class nodo::utils::network::tor ( + $ensure = 'installed', +) { nodo::subsystem::apt::repo { 'torproject.org': definition => "deb [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/torproject.org.gpg', @@ -10,4 +12,10 @@ class nodo::utils::network::tor { ensure => present, require => Nodo::Subsystem::Apt::Repo['torproject.org'], } + + package { [ + 'tor-arm', + ]: + ensure => $ensure, + } } diff --git a/manifests/utils/tor.pp b/manifests/utils/tor.pp deleted file mode 100644 index e229009..0000000 --- a/manifests/utils/tor.pp +++ /dev/null @@ -1,9 +0,0 @@ -class nodo::utils::tor ( - $ensure = 'installed', -) { - package { [ - 'tor-arm', - ]: - ensure => $ensure, - } -} |