Skip to content

GitLab

Commit 2664393a authored by James T. Lee's avatar James T. Lee
Browse files

Fixes based on tests

parent f774b295
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 164 deletions
.fixtures.yml 0 → 100644
View file @ 2664393a
fixtures:
forge_modules:
stdlib: 'puppetlabs/stdlib'
portage: 'gentoo/portage'
augeasproviders_core: 'herculesteam/augeasproviders_core'
augeasproviders_sysctl: 'herculesteam/augeasproviders_sysctl'
concat: 'puppetlabs/concat'
firewall: 'puppetlabs/firewall'
vcsrepo: 'puppetlabs/vcsrepo'
puppet: 'theforeman/puppet'
.rspec 0 → 100644
View file @ 2664393a
--format documentation
Gemfile
View file @ 2664393a
...@@ -7,6 +7,7 @@ gem 'puppetlabs_spec_helper', '>= 1.2.0' ...@@ -7,6 +7,7 @@ gem 'puppetlabs_spec_helper', '>= 1.2.0'
gem 'puppet-lint', '>= 1.0.0' gem 'puppet-lint', '>= 1.0.0'
gem 'facter', '>= 1.7.0' gem 'facter', '>= 1.7.0'
gem 'rspec-puppet' gem 'rspec-puppet'
gem 'rspec-puppet-facts', '~> 1.7', :require => false
# rspec must be v2 for ruby 1.8.7 # rspec must be v2 for ruby 1.8.7
if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
......
manifests/init.pp
View file @ 2664393a
...@@ -2,12 +2,12 @@ class nest ( ...@@ -2,12 +2,12 @@ class nest (
$nestfs_hostname, $nestfs_hostname,
$openvpn_hostname, $openvpn_hostname,
$lastfm_pw_hash = undef,
$lastpass_username = undef,
$nullmailer_config, $nullmailer_config,
$root_mail_alias, $root_mail_alias,
$ssh_private_key, $ssh_private_key,
$pw_hash, $pw_hash,
$lastfm_pw_hash = undef,
$lastpass_username = undef,
$cnames = {}, $cnames = {},
$distcc_hosts = {}, $distcc_hosts = {},
......
manifests/mysql.pp
View file @ 2664393a
...@@ -8,7 +8,7 @@ class nest::mysql { ...@@ -8,7 +8,7 @@ class nest::mysql {
service_provider => 'systemd', service_provider => 'systemd',
} }
unless str2bool("$::chroot") { unless str2bool($::chroot) {
exec { 'mysql-tmpfiles-create': exec { 'mysql-tmpfiles-create':
command => '/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/mysql.conf', command => '/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/mysql.conf',
creates => '/run/mysqld', creates => '/run/mysqld',
......
manifests/node/falcon.pp
View file @ 2664393a
...@@ -14,10 +14,10 @@ class nest::node::falcon { ...@@ -14,10 +14,10 @@ class nest::node::falcon {
file { file {
default: default:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'nzbget', owner => 'nzbget',
group => 'media', group => 'media',
; ;
'/srv/nzbget': '/srv/nzbget':
...@@ -38,10 +38,10 @@ class nest::node::falcon { ...@@ -38,10 +38,10 @@ class nest::node::falcon {
file { file {
default: default:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'ombi', owner => 'ombi',
group => 'media', group => 'media',
; ;
'/srv/ombi': '/srv/ombi':
...@@ -55,10 +55,10 @@ class nest::node::falcon { ...@@ -55,10 +55,10 @@ class nest::node::falcon {
file { file {
default: default:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'plex', owner => 'plex',
group => 'media', group => 'media',
; ;
'/srv/plex': '/srv/plex':
...@@ -75,10 +75,10 @@ class nest::node::falcon { ...@@ -75,10 +75,10 @@ class nest::node::falcon {
file { file {
default: default:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'radarr', owner => 'radarr',
group => 'media', group => 'media',
; ;
'/srv/radarr': '/srv/radarr':
...@@ -92,10 +92,10 @@ class nest::node::falcon { ...@@ -92,10 +92,10 @@ class nest::node::falcon {
file { file {
default: default:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'sonarr', owner => 'sonarr',
group => 'media', group => 'media',
; ;
'/srv/sonarr': '/srv/sonarr':
...@@ -142,16 +142,16 @@ class nest::node::falcon { ...@@ -142,16 +142,16 @@ class nest::node::falcon {
} }
docker::run { 'plex': docker::run { 'plex':
image => 'plexinc/pms-docker:plexpass', image => 'plexinc/pms-docker:plexpass',
net => 'host', net => 'host',
env => ['PLEX_UID=32400', 'PLEX_GID=1001', 'TZ=America/New_York'], env => ['PLEX_UID=32400', 'PLEX_GID=1001', 'TZ=America/New_York'],
volumes => [ volumes => [
'/srv/plex/config:/config', '/srv/plex/config:/config',
'/srv/plex/transcode:/transcode', '/srv/plex/transcode:/transcode',
'/nest/movies:/movies', '/nest/movies:/movies',
'/nest/tv:/tv', '/nest/tv:/tv',
], ],
require => File['/srv/plex/config'], require => File['/srv/plex/config'],
} }
docker::run { 'radarr': docker::run { 'radarr':
...@@ -247,7 +247,8 @@ class nest::node::falcon { ...@@ -247,7 +247,8 @@ class nest::node::falcon {
} }
sysctl { 'fs.inotify.max_user_watches': sysctl { 'fs.inotify.max_user_watches':
value => '1048576', value => '1048576',
target => '/etc/sysctl.d/nest.conf',
} }
nest::portage::package_use { 'media-sound/beets': nest::portage::package_use { 'media-sound/beets':
......
manifests/portage/package_use.pp
View file @ 2664393a
define nest::portage::package_use ( define nest::portage::package_use (
$package = $name,
$use, $use,
$package = $name,
) { ) {
package_use { $package: package_use { $package:
use => $use, use => $use,
...@@ -14,8 +14,8 @@ define nest::portage::package_use ( ...@@ -14,8 +14,8 @@ define nest::portage::package_use (
} }
if defined(Package[$name]) { if defined(Package[$name]) {
Package_use[$package] -> Package_use[$package]
Package[$name] -> -> Package[$name]
Exec["emerge-newuse-${name}"] -> Exec["emerge-newuse-${name}"]
} }
} }
manifests/profile/base.pp
View file @ 2664393a
...@@ -23,9 +23,9 @@ class nest::profile::base { ...@@ -23,9 +23,9 @@ class nest::profile::base {
# Setup distcc before portage, but distccd needs systemd, which is # Setup distcc before portage, but distccd needs systemd, which is
# installed after portage is configured. # installed after portage is configured.
Class['::nest::profile::base::distcc'] -> Class['::nest::profile::base::distcc']
Class['::nest::profile::base::portage'] -> -> Class['::nest::profile::base::portage']
Class['::nest::profile::base::distccd'] -> Class['::nest::profile::base::distccd']
# Git should be installed before managing any Vcsrepos # Git should be installed before managing any Vcsrepos
Class['::nest::profile::base::git'] -> Vcsrepo <| provider == git |> Class['::nest::profile::base::git'] -> Vcsrepo <| provider == git |>
...@@ -35,44 +35,44 @@ class nest::profile::base { ...@@ -35,44 +35,44 @@ class nest::profile::base {
Class['::nest::profile::base::portage'] -> Nest::Portage::Package_use <| |> Class['::nest::profile::base::portage'] -> Nest::Portage::Package_use <| |>
# Portage configuration (profile) responsible for installing systemd # Portage configuration (profile) responsible for installing systemd
Class['::nest::profile::base::portage'] -> Class['::nest::profile::base::portage']
Class['::nest::profile::base::systemd'] -> Class['::nest::profile::base::systemd']
# Dracut depends on systemd/console setup # Dracut depends on systemd/console setup
Class['::nest::profile::base::systemd'] ~> Class['::nest::profile::base::systemd']
Class['::nest::profile::base::dracut'] ~> Class['::nest::profile::base::dracut']
# Rebuild initramfs and reconfigure GRUB after kernel changes # Rebuild initramfs and reconfigure GRUB after kernel changes
Class['::nest::profile::base::kernel'] ~> Class['::nest::profile::base::kernel']
Class['::nest::profile::base::dracut'] ~> ~> Class['::nest::profile::base::dracut']
Class['::nest::profile::base::grub'] ~> Class['::nest::profile::base::grub']
# Rebuild initramfs after ZFS changes # Rebuild initramfs after ZFS changes
Class['::nest::profile::base::kernel'] -> Class['::nest::profile::base::kernel']
Class['::nest::profile::base::zfs'] ~> -> Class['::nest::profile::base::zfs']
Class['::nest::profile::base::dracut'] ~> Class['::nest::profile::base::dracut']
# Sudo requires configured MTA # Sudo requires configured MTA
Class['::nest::profile::base::mta'] -> Class['::nest::profile::base::mta']
Class['::nest::profile::base::sudo'] -> Class['::nest::profile::base::sudo']
# Dracut liveimg depends on dhcp, pulled in by network class # Dracut liveimg depends on dhcp, pulled in by network class
Class['::nest::profile::base::network'] -> Class['::nest::profile::base::network']
Class['::nest::profile::base::dracut'] -> Class['::nest::profile::base::dracut']
# OpenVPN modifies resolvconf which is installed for NetworkManager # OpenVPN modifies resolvconf which is installed for NetworkManager
Class['::nest::profile::base::network'] -> Class['::nest::profile::base::network']
Class['::nest::profile::base::openvpn'] -> Class['::nest::profile::base::openvpn']
# PolicyKit is pulled in by NetworkManager # PolicyKit is pulled in by NetworkManager
Class['::nest::profile::base::network'] -> Class['::nest::profile::base::network']
Class['::nest::profile::base::policykit'] -> Class['::nest::profile::base::policykit']
if $::nest::libvirt { if $::nest::libvirt {
contain '::nest::profile::base::libvirt' contain '::nest::profile::base::libvirt'
# libvirt ebuild checks kernel config # libvirt ebuild checks kernel config
Class['::nest::profile::base::kernel'] -> Class['::nest::profile::base::kernel']
Class['::nest::profile::base::libvirt'] -> Class['::nest::profile::base::libvirt']
} }
} }
manifests/profile/base/distcc.pp
View file @ 2664393a
...@@ -32,7 +32,7 @@ class nest::profile::base::distcc { ...@@ -32,7 +32,7 @@ class nest::profile::base::distcc {
'/usr/lib/distcc/bin/gcc', '/usr/lib/distcc/bin/gcc',
]: ]:
ensure => link, ensure => link,
target => "/usr/lib/distcc/bin/${toolchain}-wrapper", target => "/usr/lib/distcc/bin/${::toolchain}-wrapper",
require => File["/usr/lib/distcc/bin/${toolchain}-wrapper"], require => File["/usr/lib/distcc/bin/${::toolchain}-wrapper"],
} }
} }
manifests/profile/base/firewall.pp
View file @ 2664393a
...@@ -21,10 +21,10 @@ class nest::profile::base::firewall { ...@@ -21,10 +21,10 @@ class nest::profile::base::firewall {
# #
# Default IPv4 ruleset # Default IPv4 ruleset
# #
firewallchain { 'INPUT:filter:IPv4': firewallchain { 'INPUT:filter:IPv4':
ensure => present, ensure => present,
purge => !str2bool("$::chroot"), purge => !str2bool($::chroot),
ignore => 'virbr\d+', ignore => 'virbr\d+',
} }
...@@ -33,18 +33,18 @@ class nest::profile::base::firewall { ...@@ -33,18 +33,18 @@ class nest::profile::base::firewall {
iniface => 'lo', iniface => 'lo',
action => accept, action => accept,
} }
->
firewall { '010 related established': firewall { '010 related established':
proto => all, proto => all,
state => ['RELATED', 'ESTABLISHED'], state => ['RELATED', 'ESTABLISHED'],
action => accept, action => accept,
} }
->
firewall { '011 ping': firewall { '011 ping':
proto => icmp, proto => icmp,
action => accept, action => accept,
} }
->
firewall { '9999 drop all': firewall { '9999 drop all':
proto => all, proto => all,
action => drop, action => drop,
...@@ -57,7 +57,7 @@ class nest::profile::base::firewall { ...@@ -57,7 +57,7 @@ class nest::profile::base::firewall {
# #
firewallchain { 'INPUT:filter:IPv6': firewallchain { 'INPUT:filter:IPv6':
ensure => present, ensure => present,
purge => !str2bool("$::chroot"), purge => !str2bool($::chroot),
} }
firewall { '000 loopback (v6)': firewall { '000 loopback (v6)':
...@@ -66,20 +66,20 @@ class nest::profile::base::firewall { ...@@ -66,20 +66,20 @@ class nest::profile::base::firewall {
action => accept, action => accept,
provider => ip6tables, provider => ip6tables,
} }
->
firewall { '010 related established (v6)': firewall { '010 related established (v6)':
proto => all, proto => all,
state => ['RELATED', 'ESTABLISHED'], state => ['RELATED', 'ESTABLISHED'],
action => accept, action => accept,
provider => ip6tables, provider => ip6tables,
} }
->
firewall { '011 icmp (v6)': firewall { '011 icmp (v6)':
proto => ipv6-icmp, proto => ipv6-icmp,
action => accept, action => accept,
provider => ip6tables, provider => ip6tables,
} }
->
firewall { '9999 drop all (v6)': firewall { '9999 drop all (v6)':
proto => all, proto => all,
action => drop, action => drop,
......
manifests/profile/base/fs.pp
View file @ 2664393a
...@@ -4,10 +4,10 @@ class nest::profile::base::fs { ...@@ -4,10 +4,10 @@ class nest::profile::base::fs {
} }
file { '/etc/systemd/system/nfs-server.service.d': file { '/etc/systemd/system/nfs-server.service.d':
ensure => directory, ensure => directory,
mode => '0655', mode => '0655',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
# Not strictly required, but packages pull in systemd # Not strictly required, but packages pull in systemd
require => Package['net-fs/nfs-utils'], require => Package['net-fs/nfs-utils'],
......
manifests/profile/base/fstab.pp
View file @ 2664393a
...@@ -4,67 +4,67 @@ class nest::profile::base::fstab { ...@@ -4,67 +4,67 @@ class nest::profile::base::fstab {
# XXX: Improve this # XXX: Improve this
if $::nest::live { if $::nest::live {
$base_changes = [ $base_changes = [
"rm *[spec]", 'rm *[spec]',
] ]
$nfs_changes = [ $nfs_changes = [
"set 1/spec ${::nest::nestfs_hostname}:/nest", "set 1/spec ${::nest::nestfs_hostname}:/nest",
"set 1/file /nest", 'set 1/file /nest',
"set 1/vfstype nfs", 'set 1/vfstype nfs',
"set 1/opt[1] noauto", 'set 1/opt[1] noauto',
"set 1/opt[2] x-systemd.automount", 'set 1/opt[2] x-systemd.automount',
"set 1/opt[3] x-systemd.requires", 'set 1/opt[3] x-systemd.requires',
"set 1/opt[3]/value openvpn-client@nest.service", 'set 1/opt[3]/value openvpn-client@nest.service',
"set 1/dump 0", 'set 1/dump 0',
"set 1/passno 0", 'set 1/passno 0',
] ]
} else { } else {
$base_changes = [ $base_changes = [
"rm *[spec]", 'rm *[spec]',
"set 1/spec LABEL=${hostname}-boot", "set 1/spec LABEL=${hostname}-boot",
"set 1/file /boot", 'set 1/file /boot',
"set 1/vfstype ext2", 'set 1/vfstype ext2',
"set 1/opt defaults", 'set 1/opt defaults',
"set 1/dump 0", 'set 1/dump 0',
"set 1/passno 2", 'set 1/passno 2',
"set 2/spec /dev/zvol/${hostname}/swap", "set 2/spec /dev/zvol/${hostname}/swap",
"set 2/file none", 'set 2/file none',
"set 2/vfstype swap", 'set 2/vfstype swap',
"set 2/opt discard", 'set 2/opt discard',
"set 2/dump 0", 'set 2/dump 0',
"set 2/passno 0", 'set 2/passno 0',
"set 3/spec none", 'set 3/spec none',
"set 3/file /var", 'set 3/file /var',
"set 3/vfstype none", 'set 3/vfstype none',
"set 3/opt[1] fake", 'set 3/opt[1] fake',
"set 3/opt[2] x-systemd.requires", 'set 3/opt[2] x-systemd.requires',
"set 3/opt[2]/value zfs-mount.service", 'set 3/opt[2]/value zfs-mount.service',
"set 3/dump 0", 'set 3/dump 0',
"set 3/passno 0", 'set 3/passno 0',
] ]
$nfs_changes = [ $nfs_changes = [
"set 4/spec /dev/zvol/${hostname}/fscache", "set 4/spec /dev/zvol/${hostname}/fscache",
"set 4/file /var/cache/fscache", 'set 4/file /var/cache/fscache',
"set 4/vfstype ext4", 'set 4/vfstype ext4',
"set 4/opt[1] defaults", 'set 4/opt[1] defaults',
"set 4/opt[2] discard", 'set 4/opt[2] discard',
"set 4/dump 0", 'set 4/dump 0',
"set 4/passno 0", 'set 4/passno 0',
"set 5/spec ${::nest::nestfs_hostname}:/nest", "set 5/spec ${::nest::nestfs_hostname}:/nest",
"set 5/file /nest", 'set 5/file /nest',
"set 5/vfstype nfs", 'set 5/vfstype nfs',
"set 5/opt[1] noauto", 'set 5/opt[1] noauto',
"set 5/opt[2] fsc", 'set 5/opt[2] fsc',
"set 5/opt[3] x-systemd.automount", 'set 5/opt[3] x-systemd.automount',
"set 5/opt[4] x-systemd.requires", 'set 5/opt[4] x-systemd.requires',
"set 5/opt[4]/value openvpn-client@nest.service", 'set 5/opt[4]/value openvpn-client@nest.service',
"set 5/dump 0", 'set 5/dump 0',
"set 5/passno 0", 'set 5/passno 0',
] ]
} }
......
manifests/profile/base/grub.pp
View file @ 2664393a
...@@ -12,10 +12,10 @@ class nest::profile::base::grub { ...@@ -12,10 +12,10 @@ class nest::profile::base::grub {
# Don't manage grub on live-booted systems # Don't manage grub on live-booted systems
unless $::mountpoints['/'] and $::mountpoints['/']['device'] == '/dev/mapper/live-rw' { unless $::mountpoints['/'] and $::mountpoints['/']['device'] == '/dev/mapper/live-rw' {
file { '/boot/grub': file { '/boot/grub':
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
} }
file { [ file { [
...@@ -83,8 +83,8 @@ class nest::profile::base::grub { ...@@ -83,8 +83,8 @@ class nest::profile::base::grub {
].flatten.join(' ').strip ].flatten.join(' ').strip
file_line { 'grub-set-kernel-cmdline': file_line { 'grub-set-kernel-cmdline':
line => "GRUB_CMDLINE_LINUX=\"${kernel_cmdline}\"", line => "GRUB_CMDLINE_LINUX=\"${kernel_cmdline}\"",
match => '^#?GRUB_CMDLINE_LINUX=', match => '^#?GRUB_CMDLINE_LINUX=',
} }
if $::nest::vm { if $::nest::vm {
...@@ -106,7 +106,7 @@ class nest::profile::base::grub { ...@@ -106,7 +106,7 @@ class nest::profile::base::grub {
} }
file_line { 'grub-set-device': file_line { 'grub-set-device':
line => "GRUB_DEVICE=", line => 'GRUB_DEVICE=',
match => '^#?GRUB_DEVICE=', match => '^#?GRUB_DEVICE=',
} }
......
manifests/profile/base/openvpn.pp
View file @ 2664393a
...@@ -113,11 +113,11 @@ class nest::profile::base::openvpn { ...@@ -113,11 +113,11 @@ class nest::profile::base::openvpn {
content => $dnsmasq_config, content => $dnsmasq_config,
notify => Service['dnsmasq'], notify => Service['dnsmasq'],
} }
$dnsmasq_cnames = $::nest::cnames.map |$alias, $cname| { "cname=${alias},${cname}" } $dnsmasq_cnames = $::nest::cnames.map |$alias, $cname| { "cname=${alias},${cname}" }
$dnsmasq_cnames_content = $dnsmasq_cnames.join("\n") $dnsmasq_cnames_content = $dnsmasq_cnames.join("\n")
$dnsmasq_cnames_ensure = $dnsmasq_cnames_content ? { $dnsmasq_cnames_ensure = $dnsmasq_cnames_content ? {
"" => 'absent', '' => 'absent',
default => 'present', default => 'present',
} }
...@@ -129,8 +129,8 @@ class nest::profile::base::openvpn { ...@@ -129,8 +129,8 @@ class nest::profile::base::openvpn {
} }
file { '/etc/systemd/system/dnsmasq.service.d': file { '/etc/systemd/system/dnsmasq.service.d':
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
} }
file { '/etc/systemd/system/dnsmasq.service.d/10-openvpn.conf': file { '/etc/systemd/system/dnsmasq.service.d/10-openvpn.conf':
......
manifests/profile/base/portage.pp
View file @ 2664393a
...@@ -14,7 +14,7 @@ class nest::profile::base::portage { ...@@ -14,7 +14,7 @@ class nest::profile::base::portage {
default => undef, default => undef,
} }
$makejobs_by_memory = ceiling($memory['system']['total_bytes'] / (512.0 * 1024 * 1024)) $makejobs_by_memory = ceiling($facts['memory']['system']['total_bytes'] / (512.0 * 1024 * 1024))
$makejobs_distcc = $::nest::distcc_hosts.reduce($::nest::processorcount + 1) |$memo, $host| { $memo + $host[1] + 1 } $makejobs_distcc = $::nest::distcc_hosts.reduce($::nest::processorcount + 1) |$memo, $host| { $memo + $host[1] + 1 }
$makejobs_distcc_min = ($makejobs_by_memory < $makejobs_distcc) ? { $makejobs_distcc_min = ($makejobs_by_memory < $makejobs_distcc) ? {
...@@ -61,18 +61,18 @@ class nest::profile::base::portage { ...@@ -61,18 +61,18 @@ class nest::profile::base::portage {
'features': 'features':
content => $portage_features; content => $portage_features;
'input_devices': 'input_devices':
content => $::nest::input_devices, ensure => $input_devices_ensure,
ensure => $input_devices_ensure; content => $::nest::input_devices;
'makeopts': 'makeopts':
content => $makeopts; content => $makeopts;
'pkgdir': 'pkgdir':
content => "/nest/portage/packages/${::architecture}-${::nest['profile']}"; content => "/nest/portage/packages/${::architecture}-${::nest['profile']}";
'use': 'use':
content => $::nest::use_combined, ensure => $use_ensure,
ensure => $use_ensure; content => $::nest::use_combined;
'video_cards': 'video_cards':
content => $::nest::video_cards, ensure => $video_cards_ensure,
ensure => $video_cards_ensure; content => $::nest::video_cards;
} }
$cflags_no_debug = regsubst($::nest::cflags, '\s?-g(gdb)?', '') $cflags_no_debug = regsubst($::nest::cflags, '\s?-g(gdb)?', '')
...@@ -145,10 +145,10 @@ class nest::profile::base::portage { ...@@ -145,10 +145,10 @@ class nest::profile::base::portage {
'/etc/portage/patches', '/etc/portage/patches',
'/etc/portage/profile' '/etc/portage/profile'
]: ]:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
} }
# Enable libzfs USE flag for GRUB # Enable libzfs USE flag for GRUB
......
manifests/profile/base/puppet.pp
View file @ 2664393a
...@@ -56,16 +56,16 @@ class nest::profile::base::puppet { ...@@ -56,16 +56,16 @@ class nest::profile::base::puppet {
} }
file { '/etc/puppetlabs/puppet/hiera.yaml': file { '/etc/puppetlabs/puppet/hiera.yaml':
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
source => 'puppet:///modules/nest/puppet/hiera.yaml' source => 'puppet:///modules/nest/puppet/hiera.yaml'
} }
Class['::puppet::server::install'] -> Class['::puppet::server::install']
Package['hiera-eyaml'] -> -> Package['hiera-eyaml']
File['/etc/puppetlabs/puppet/hiera.yaml'] ~> -> File['/etc/puppetlabs/puppet/hiera.yaml']
Class['::puppet::server::service'] ~> Class['::puppet::server::service']
package { 'r10k': package { 'r10k':
ensure => installed, ensure => installed,
...@@ -131,8 +131,8 @@ class nest::profile::base::puppet { ...@@ -131,8 +131,8 @@ class nest::profile::base::puppet {
$scaling_facts = @("SCALING_FACTS") $scaling_facts = @("SCALING_FACTS")
--- ---
scaling: scaling:
gui: $::nest::gui_scaling_factor gui: ${::nest::gui_scaling_factor}
text: $::nest::text_scaling_factor text: ${::nest::text_scaling_factor}
| SCALING_FACTS | SCALING_FACTS
file { '/etc/puppetlabs/facter/facts.d/scaling.yaml': file { '/etc/puppetlabs/facter/facts.d/scaling.yaml':
......
manifests/profile/base/users.pp
View file @ 2664393a
...@@ -11,9 +11,9 @@ class nest::profile::base::users { ...@@ -11,9 +11,9 @@ class nest::profile::base::users {
} }
file_line { 'useradd-group': file_line { 'useradd-group':
path => '/etc/default/useradd', path => '/etc/default/useradd',
line => 'GROUP=1000', line => 'GROUP=1000',
match => '^GROUP=', match => '^GROUP=',
} }
group { group {
......
manifests/profile/base/zfs.pp
View file @ 2664393a
...@@ -25,13 +25,15 @@ class nest::profile::base::zfs { ...@@ -25,13 +25,15 @@ class nest::profile::base::zfs {
# ZFS likes to have a little extra headroom on low memory systems # ZFS likes to have a little extra headroom on low memory systems
sysctl { 'vm.min_free_kbytes': sysctl { 'vm.min_free_kbytes':
value => '32768', value => '32768',
target => '/etc/sysctl.d/nest.conf',
} }
# Not strictly ZFS related, though our swap is on ZFS, but this # Not strictly ZFS related, though our swap is on ZFS, but this
# seems to improve stability in low memory conditions, counterintuitively. # seems to improve stability in low memory conditions, counterintuitively.
sysctl { 'vm.swappiness': sysctl { 'vm.swappiness':
value => '10', value => '10',
target => '/etc/sysctl.d/nest.conf',
} }
group { 'zfssnap': group { 'zfssnap':
......
manifests/profile/workstation.pp
View file @ 2664393a
...@@ -23,27 +23,27 @@ class nest::profile::workstation { ...@@ -23,27 +23,27 @@ class nest::profile::workstation {
# Plasma pulls in xorg-drivers which builds nvidia-drivers which requires # Plasma pulls in xorg-drivers which builds nvidia-drivers which requires
# a built kernel and needs to come before building the initramfs. # a built kernel and needs to come before building the initramfs.
Class['::nest::profile::base::kernel'] -> Class['::nest::profile::base::kernel']
Class['::nest::profile::workstation::plasma'] -> -> Class['::nest::profile::workstation::plasma']
Class['::nest::profile::base::dracut'] -> Class['::nest::profile::base::dracut']
# Plasma installs pulseaudio, so we don't need to manage it separately # Plasma installs pulseaudio, so we don't need to manage it separately
Class['::nest::profile::workstation::plasma'] -> Class['::nest::profile::workstation::plasma']
Class['::nest::profile::workstation::pulseaudio'] -> Class['::nest::profile::workstation::pulseaudio']
# Plasma installs xorg-server, so we don't need to manage it separately # Plasma installs xorg-server, so we don't need to manage it separately
Class['::nest::profile::workstation::plasma'] -> Class['::nest::profile::workstation::plasma']
Class['::nest::profile::workstation::xorg'] -> Class['::nest::profile::workstation::xorg']
# Plasma installs default cursors which we want to replace # Plasma installs default cursors which we want to replace
Class['::nest::profile::workstation::plasma'] -> Class['::nest::profile::workstation::plasma']
Class['::nest::profile::workstation::cursor'] -> Class['::nest::profile::workstation::cursor']
# Manage mouse settings after xorg # Manage mouse settings after xorg
Class['::nest::profile::workstation::xorg'] -> Class['::nest::profile::workstation::xorg']
Class['::nest::profile::workstation::mouse'] -> Class['::nest::profile::workstation::mouse']
# NetworkManager pulls in bluez # NetworkManager pulls in bluez
Class['::nest::profile::base::network'] -> Class['::nest::profile::base::network']
Class['::nest::profile::workstation::bluetooth'] -> Class['::nest::profile::workstation::bluetooth']
} }
manifests/profile/workstation/chromium.pp
View file @ 2664393a
...@@ -11,7 +11,7 @@ class nest::profile::workstation::chromium { ...@@ -11,7 +11,7 @@ class nest::profile::workstation::chromium {
; ;
'/etc/portage/patches/www-client/chromium': '/etc/portage/patches/www-client/chromium':
source => "puppet:///modules/nest/chromium/", source => 'puppet:///modules/nest/chromium/',
recurse => true, recurse => true,
purge => true, purge => true,
before => Package['www-client/chromium'], before => Package['www-client/chromium'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment