Some TPC changes (2)

diff --git a/manifests/role/tpc.pp b/manifests/role/tpc.pp
index aa37f53bb2af80f982f406732ac11db66ab87603..6405ed1c063316d134f45033b2216c86ef52ac7f 100644 (file)
--- 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 530117ed31170f4b38fcbfb0d2f7b30167b1c0da..ceb74ab156caf73fdfa7f28963deceb1dadd976f 100644 (file)
--- 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 58e7cf80b56efc5135f3bfd5a09fcd495101468b..c1f01ebd725e4d33fa6bda8e35b0e3532cae7d2b 100644 (file)
--- 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 aee0635e26d9a1c0e949abcecc087906186b0a97..915d4ed25f3f120740edd245c62780940165cac6 100644 (file)
--- 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,
   }
 }