Drop ensure_cachefilesd_runs and define class for checkfilesd-management.

1 files changed, 16 insertions, 64 deletions

diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 903c465..7b62d41 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -119,6 +119,15 @@ class browsers {
 	}
 }
 
+class cachefilesd {
+<------>exec { 'modify_cachefilesd':
+<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd"
+<------>}
+<------>exec { 'ensure_cachefilesd_enabled':.
+<------><------>command => "/bin/systemctl enable cachefilesd.service"
+<------>}
+}
+
 class itzks_systems_common {
 	package { 'itzks-systems-common':
 		ensure => 'latest',
@@ -370,15 +379,7 @@ node /^mw.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^nbw.*\.intern$/ {
@@ -401,15 +402,7 @@ node /^nbw.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^net.*\.intern$/ {
@@ -432,15 +425,7 @@ node /^net.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^snb.*\.intern$/ {
@@ -463,15 +448,7 @@ node /^snb.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^t410.*\.intern$/ {
@@ -494,15 +471,7 @@ node /^t410.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^t61.*\.intern$/ {
@@ -525,15 +494,7 @@ node /^t61.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
 node /^tp.*\.intern$/ {
@@ -556,18 +517,9 @@ node /^tp.*\.intern$/ {
 		},
 	}
 	class { 'browsers': }
-<------>exec { 'modify_cachefilesd':
-<------><------>command => "/bin/sed -e 's/\#RUN=yes/RUN=yes/g' -i /etc/default/cachefilesd",
-<------>}
-<------>exec { 'ensure_cachefilesd_enabled':.
-<------><------>command => "/bin/systemctl enable cachefilesd.service",
-<------>}
-#<------>exec { 'ensure_cachefilesd_runs':.
-#<------><------>command => "/bin/systemctl start cachefilesd.service",
-#<------>}
+	class { 'cachefilesd': }
 }
 
-
 # default / minimal
 node "default" {
 	class { 'ssh_pubkeys_admins': }