Allow User to add additonal systemd options to instances

saz · Feb 13, 2024 · bec4f1a · bec4f1a
1 parent 7e9d28f
commit bec4f1a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/manifests/server/instances.pp b/manifests/server/instances.pp
@@ -37,9 +37,11 @@
 ) {
   include ssh::server
 
-  $sshd_instance_config       = assert_type(Hash, pick($options['sshd_config'], {}))
-  $sshd_instance_matchblocks  = assert_type(Hash, pick($options['match_blocks'], {}))
-  $sshd_service_options       = $options['sshd_service_options']
+  $sshd_instance_config             = assert_type(Hash, pick($options['sshd_config'], {}))
+  $sshd_instance_matchblocks        = assert_type(Hash, pick($options['match_blocks'], {}))
+  $sshd_service_options             = $options['sshd_service_options']
+  $sshd_additional_service_options  = $options['sshd_additional_service_options']
+
   #check if server is a linux
   if $facts['kernel'] == 'Linux' {
     case $validate_config_file {

diff --git a/templates/ssh_instance_service.erb b/templates/ssh_instance_service.erb
@@ -9,6 +9,19 @@ After=network.target sshd-keygen.service
 Wants=sshd-keygen.service
 
 [Service]
+<%- if @sshd_additional_service_options -%>
+<%- @sshd_additional_service_options.each do |k,v| -%>
+<%- if v.is_a?(Array) -%>
+<%- v.each do |a| -%>
+<%- if a != '' && a != nil -%>
+<%= k %>=<%= bool2str(a) %>
+<%- end -%>
+<%- end -%>
+<%- elsif v != '' && v != nil -%>
+<%= k %>=<%= bool2str(v) %>
+<%- end -%>
+<%- end -%>
+<%- end -%>
 <% if @sshd_environments_file %>
 EnvironmentFile=<%= @sshd_environments_file -%>
 <% end %>