Commit 13f3178f authored by James T. Lee's avatar James T. Lee
Browse files

systemd: Clean up override files

Standardize on starting with the drop-in files with "10-" and dashes for
spaces.  Looks nice and allows for ordering the overrides.
parent 48971d4d
class nest::base::distccd { class nest::base::distccd {
if $::nest::distcc_server { if $::nest::distcc_server {
$disable_verbose_content = @(EOT) file { '/etc/systemd/system/distccd.service.d/00gentoo.conf':
[Service] ensure => absent,
ExecStart= }
ExecStart=/usr/bin/distccd --no-detach --daemon --port 3632 -N 15 --allow 0.0.0.0/0
| EOT
file { '/etc/systemd/system/distccd.service.d/10-nest.conf': file { '/etc/systemd/system/distccd.service.d/10-allowed-servers.conf':
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
content => $disable_verbose_content, content => "[Service]\nEnvironment=\"ALLOWED_SERVERS=0.0.0.0/0\"\n",
notify => Nest::Lib::Systemd_reload['distccd'], notify => Nest::Lib::Systemd_reload['distccd'],
} }
......
...@@ -120,6 +120,10 @@ class nest::base::fstab { ...@@ -120,6 +120,10 @@ class nest::base::fstab {
; ;
'/etc/systemd/system/var.mount.d/lazyunmount.conf': '/etc/systemd/system/var.mount.d/lazyunmount.conf':
ensure => absent,
;
'/etc/systemd/system/var.mount.d/10-lazy-unmount.conf':
content => $var_lazy_unmount, content => $var_lazy_unmount,
notify => Nest::Lib::Systemd_reload['fstab'], notify => Nest::Lib::Systemd_reload['fstab'],
; ;
......
...@@ -21,6 +21,10 @@ class nest::base::zfs { ...@@ -21,6 +21,10 @@ class nest::base::zfs {
; ;
'/etc/systemd/system/zfs-mount.service.d/load-key.conf': '/etc/systemd/system/zfs-mount.service.d/load-key.conf':
ensure => absent,
;
'/etc/systemd/system/zfs-mount.service.d/10-load-key.conf':
content => $zfs_mount_override, content => $zfs_mount_override,
notify => Nest::Lib::Systemd_reload['zfs'], notify => Nest::Lib::Systemd_reload['zfs'],
; ;
......
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