Move ulimit management into the instance define

This allows any service where the ulimit isn't in the service file to be managed via a drop in.
voxpupuli · Apr 19, 2021 · 0f930aa · 0f930aa
1 parent febaf13
commit 0f930aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -332,6 +332,15 @@
       mode    => '0644',
       content => template('redis/service_templates/redis.service.erb'),
     }
+  } else {
+    if $ulimit_managed {
+      systemd::service_limits { "${service_name}.service":
+        limits          => {
+          'LimitNOFILE' => $ulimit,
+        },
+        restart_service => false,
+      }
+    }
   }
 
   $_real_log_file = $log_file ? {

diff --git a/manifests/ulimit.pp b/manifests/ulimit.pp
@@ -27,13 +27,7 @@
     }
   }
 
-  systemd::service_limits { "${redis::service_name}.service":
-    limits          => {
-      'LimitNOFILE' => $redis::ulimit,
-    },
-    restart_service => false,
-  }
-
+  # Migrate from the old managed service
   file { "/etc/systemd/system/${redis::service_name}.service.d/limit.conf":
     ensure => absent,
   }