Add molly, adapt to trixie

diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp
index 2452f9825654a06ce7c9ab4c3bf5e097b623ed7a..54b5a3ed9bc1dec99dcf67944b7560c1dc8d4e3f 100644 (file)
--- a/personal_infra/puppet/modules/basic_software/manifests/init.pp
+++ b/personal_infra/puppet/modules/basic_software/manifests/init.pp
@@ -1,5 +1,5 @@
 class basic_software {
-  package {['less', 'mlocate', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git', 'net-tools', 'pipx', 'rsync', 'bash-completion', 'moreutils']:}
+  package {['less', 'traceroute', 'nmap', 'tree', 'tar', 'screen', 'git', 'net-tools', 'pipx', 'rsync', 'bash-completion', 'moreutils']:}
 
   if($facts['os']['family'] == 'RedHat') {
     package {'which':}
@@ -13,17 +13,22 @@ class basic_software {
   }
 
   if ($facts['os']['family'] == 'Debian') {
-    file {'/etc/apt/preferences.d/90_emacs':
-      content => @(EOT)
-      Package: src:emacs
-      Pin: release n=bookworm-backports
-      Pin-Priority: 990
-      | EOT
-      ,
-    }
-    ~>
-    Exec["/usr/bin/apt update"]
-    ->
     package {'emacs-nox':}
+    if ($facts['os']['release']['major'] == 12) {
+      file {'/etc/apt/preferences.d/90_emacs':
+        content => @(EOT)
+        Package: src:emacs
+        Pin: release n=bookworm-backports
+        Pin-Priority: 990
+        | EOT
+        ,
+      }
+      ~>
+      Exec["/usr/bin/apt update"]
+      ->
+      Package['emacs-nox']
+
+      package {'mlocate':}
+    }
   }
 }

diff --git a/personal_infra/puppet/site/molly.ipa.pdp7.net.pp b/personal_infra/puppet/site/molly.ipa.pdp7.net.pp
new file mode 100644 (file)
index 0000000..f386483
--- /dev/null
+++ b/personal_infra/puppet/site/molly.ipa.pdp7.net.pp
@@ -0,0 +1,5 @@
+node 'molly.ipa.pdp7.net' {
+  class {'workstation':}
+  class {'steam':}
+  package {['nextcloud-desktop']:}
+}