From 4df28c96105cf20c9c32fff0268e159adafac6d4 Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
Date: Wed, 20 Jan 2021 18:29:37 +0100
Subject: [PATCH] workstation: move slim to own class
There is no need for slim on Shipon. Move it to its own class.
---
manifests/workstation.pp | 22 ----------------------
manifests/workstation/slim.pp | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 22 deletions(-)
create mode 100644 manifests/workstation/slim.pp
diff --git a/manifests/workstation.pp b/manifests/workstation.pp
index ef483e4..f3bf533 100644
--- a/manifests/workstation.pp
+++ b/manifests/workstation.pp
@@ -195,33 +195,11 @@ class freebsd::workstation inherits freebsd::base {
mode => '0644',
}
- file { '/usr/local/etc/slim.conf':
- ensure => file,
- source => 'puppet:///modules/freebsd/workstation/slim.conf',
- owner => 'root',
- group => 'wheel',
- mode => '0644',
- }
-
- file { '/usr/local/share/slim-lysator/themes/':
- ensure => directory,
- recurse => true,
- source => 'puppet:///modules/freebsd/workstation/slim.themes/',
- owner => 'root',
- group => 'wheel',
- mode => '0644',
- }
-
file_line { 'Enable D-Bus':
path => '/etc/rc.conf',
line => 'dbus_enable="YES"',
}
- file_line { 'Enable slim login manager':
- path => '/etc/rc.conf',
- line => 'slim_enable="YES"',
- }
-
# Set default Xorg keyboard layout to Swedish.
file { '/usr/local/etc/X11/xorg.conf.d/keyboard.conf':
ensure => file,
diff --git a/manifests/workstation/slim.pp b/manifests/workstation/slim.pp
new file mode 100644
index 0000000..d2bcad0
--- /dev/null
+++ b/manifests/workstation/slim.pp
@@ -0,0 +1,24 @@
+#
+class freebsd::workstation::slim {
+ file { '/usr/local/etc/slim.conf':
+ ensure => file,
+ source => 'puppet:///modules/freebsd/workstation/slim.conf',
+ owner => 'root',
+ group => 'wheel',
+ mode => '0644',
+ }
+
+ file { '/usr/local/share/slim-lysator/themes/':
+ ensure => directory,
+ recurse => true,
+ source => 'puppet:///modules/freebsd/workstation/slim.themes/',
+ owner => 'root',
+ group => 'wheel',
+ mode => '0644',
+ }
+
+ file_line { 'Enable slim login manager':
+ path => '/etc/rc.conf',
+ line => 'slim_enable="YES"',
+ }
+}
--
GitLab