From a884889967a3b5d7c00caf3b09d46c4796206704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 30 Dec 2021 13:29:23 +0100
Subject: cleanup

---
 modules/profiles/manifests/common.pp                | 20 --------------------
 modules/profiles/manifests/workstation.pp           | 12 +++++++-----
 modules/profiles/manifests/workstation/archlinux.pp |  3 +--
 3 files changed, 8 insertions(+), 27 deletions(-)

(limited to 'modules')

diff --git a/modules/profiles/manifests/common.pp b/modules/profiles/manifests/common.pp
index ec7197d..f5a9824 100644
--- a/modules/profiles/manifests/common.pp
+++ b/modules/profiles/manifests/common.pp
@@ -5,24 +5,4 @@ class profiles::common {
     line   => "::1\t${::fqdn}\t${facts['name']}",
     path   => '/etc/hosts',
   }
-
-  # extlib__puppet_config contains our current settings.
-  # This saves whatever was passed in the --server flag
-  # to disk
-  #   ini_setting { 'Puppet Server':
-  #     ensure       => present,
-  #     path         => '/etc/puppetlabs/puppet/puppet.conf',
-  #     section      => 'main',
-  #     setting      => 'server',
-  #     indent_char  => ' ',
-  #     indent_width => 4,
-  #     value        => $facts['extlib__puppet_config']['main']['server'],
-  #   }
-  # 
-  #   # Manage puppet manually, instead of through theforeman/puppet,
-  #   # since they haven't bothered to document their module.
-  #   service { 'puppet':
-  #     ensure => running,
-  #     enable => true,
-  #   }
 }
diff --git a/modules/profiles/manifests/workstation.pp b/modules/profiles/manifests/workstation.pp
index fe7e1cb..2b11524 100644
--- a/modules/profiles/manifests/workstation.pp
+++ b/modules/profiles/manifests/workstation.pp
@@ -4,10 +4,11 @@ class profiles::workstation {
 
   include ::profiles::group_profile
 
-  # TODO only if we use systemd
-  file { 'User ssh-agent service':
-    path   => '/etc/systemd/user/ssh-agent.service',
-    source => "puppet:///modules/profiles/ssh-agent.service",
+  if ($facts['systemd']) {
+    file { 'User ssh-agent service':
+      path   => '/etc/systemd/user/ssh-agent.service',
+      source => "puppet:///modules/profiles/ssh-agent.service",
+    }
   }
 
   file { 'Dvorak A6 TTY keyboard layout':
@@ -112,7 +113,8 @@ class profiles::workstation {
   file { '/etc/locale.gen':
     content => $locales.join("\n")
   } ~> exec { 'locale-gen':
-    path => [ '/bin', '/usr/bin', ],
+    path        => [ '/bin', '/usr/bin', ],
+    refreshonly => true,
   }
 
   file { 'Default locales':
diff --git a/modules/profiles/manifests/workstation/archlinux.pp b/modules/profiles/manifests/workstation/archlinux.pp
index 5274699..0919efd 100644
--- a/modules/profiles/manifests/workstation/archlinux.pp
+++ b/modules/profiles/manifests/workstation/archlinux.pp
@@ -13,8 +13,7 @@ class profiles::workstation::archlinux {
 
   package { 'kernel-modules-hook':
     ensure => installed,
-  } ~> service { 'linux-modules-cleanup':
-    ensure => running,
+  } -> service { 'linux-modules-cleanup':
     enable => true,
   }
 
-- 
cgit v1.2.3