diff options
| author | root <root@molly.ipa.pdp7.net> | 2025-08-10 15:37:47 +0200 |
|---|---|---|
| committer | alexpdp7 <alex@corcoles.net> | 2025-08-10 15:40:21 +0200 |
| commit | 8f94179b5ca22dde9415b579a575da5e49a12607 (patch) | |
| tree | 5d4a27cf0988d2cf04ff4acddfbac5c15eeb0d02 /personal_infra | |
| parent | e304a677f140740c3d2b9232031512fb257cb343 (diff) | |
Add molly, adapt to trixie
Diffstat (limited to 'personal_infra')
| -rw-r--r-- | personal_infra/puppet/modules/basic_software/manifests/init.pp | 29 | ||||
| -rw-r--r-- | personal_infra/puppet/site/molly.ipa.pdp7.net.pp | 5 |
2 files changed, 22 insertions, 12 deletions
diff --git a/personal_infra/puppet/modules/basic_software/manifests/init.pp b/personal_infra/puppet/modules/basic_software/manifests/init.pp index 2452f982..54b5a3ed 100644 --- 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 index 00000000..f386483b --- /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']:} +} |