diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2022-01-02 21:21:14 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2022-01-02 21:21:14 -0300 |
| commit | 1e652180e6273dfd5fffce70e6913f7f65a87cbc (patch) | |
| tree | 1d9f936d715b128d0620d9dc91288dd2b5f6a158 | |
| parent | 5f1dc34fb0cb9fc219eddee315d89260f591ef57 (diff) | |
| download | puppet-nodo-1e652180e6273dfd5fffce70e6913f7f65a87cbc.tar.gz puppet-nodo-1e652180e6273dfd5fffce70e6913f7f65a87cbc.tar.bz2 | |
Some TPC changes (2)
| -rw-r--r-- | manifests/role/tpc.pp | 6 | ||||
| -rw-r--r-- | manifests/utils/office.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/web/gui.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/web/hardened.pp | 11 |
4 files changed, 16 insertions, 7 deletions
diff --git a/manifests/role/tpc.pp b/manifests/role/tpc.pp index aa37f53..6405ed1 100644 --- a/manifests/role/tpc.pp +++ b/manifests/role/tpc.pp @@ -3,10 +3,12 @@ class nodo::role::tpc( $version = '1', ) { include nodo::base::laptop + include nodo::subsystem::network::manager::macchanger + include onion + + # Disabled and old stuff #include nodo::utils::web::hardened #include nodo::subsystem::udev::network #include nodo::subsystem::network::wicd::macchanger #include onion::full - include nodo::subsystem::network::manager::macchanger - include onion } diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp index 530117e..ceb74ab 100644 --- a/manifests/utils/office.pp +++ b/manifests/utils/office.pp @@ -23,6 +23,6 @@ class nodo::utils::office ( 'dia', 'calibre', ]: - ensure => absent, + ensure => absent, } } diff --git a/manifests/utils/web/gui.pp b/manifests/utils/web/gui.pp index 58e7cf8..c1f01eb 100644 --- a/manifests/utils/web/gui.pp +++ b/manifests/utils/web/gui.pp @@ -44,7 +44,7 @@ class nodo::utils::web::gui ( ensure => $ensure ? { 'present' => "/usr/bin/firefox-esr", 'installed' => "/usr/bin/firefox-esr", - default => undef, + default => undef, }, owner => root, group => root, @@ -56,7 +56,7 @@ class nodo::utils::web::gui ( ensure => $ensure ? { 'present' => "/usr/share/man/man1/firefox-esr.1.gz", 'installed' => "/usr/share/man/man1/firefox-esr.1.gz", - default => undef, + default => undef, }, owner => root, group => root, diff --git a/manifests/utils/web/hardened.pp b/manifests/utils/web/hardened.pp index aee0635..915d4ed 100644 --- a/manifests/utils/web/hardened.pp +++ b/manifests/utils/web/hardened.pp @@ -1,11 +1,18 @@ class nodo::utils::web::hardened inherits nodo::utils::web::gui( $ensure = 'installed', ) { - package { [ + package { [ + 'torbrowser-launcher', + ]: + ensure => $ensure, + } + + # Old stuff + package { [ 'torbrowser-launcher', 'xul-ext-requestpolicy', 'xul-ext-certificatepatrol', ]: - ensure => $ensure, + ensure => absent, } } |