From 3cf9adf7b115c30b37305e56472cf5e47afa0a78 Mon Sep 17 00:00:00 2001 From: Aday Bujeda Date: Thu, 9 Jan 2025 19:33:17 +0000 Subject: [PATCH 1/3] Added configuration to enable/disable maintenance with Puppet --- manifests/config.pp | 9 +++++++++ manifests/init.pp | 3 +++ 2 files changed, 12 insertions(+) diff --git a/manifests/config.pp b/manifests/config.pp index a4be954..17a5991 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -94,6 +94,15 @@ mode => '0755', } + if $openondemand::maintenance_enabled != undef { + file { "/etc/ood/maintenance.enable": + ensure => $openondemand::maintenance_enabled ? { true => 'file', false => 'absent' }, + owner => 'root', + group => 'root', + mode => '0644', + } + } + file { '/etc/ood/config': ensure => 'directory', owner => 'root', diff --git a/manifests/init.pp b/manifests/init.pp index ce9eaaf..272939f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -66,6 +66,8 @@ # Source for maintenance index.html # @param maintenance_content # Content for maintenance index.html +# @param maintenance_enabled +# Enable maintenance mode in OOD # @param security_csp_frame_ancestors # ood_portal.yml security_csp_frame_ancestors # @param security_strict_transport @@ -286,6 +288,7 @@ Array $maintenance_ip_allowlist = [], Optional[String] $maintenance_source = undef, Optional[String] $maintenance_content = undef, + Optional[Boolean] $maintenance_enabled = undef, Optional[Variant[String, Boolean]] $security_csp_frame_ancestors = undef, Boolean $security_strict_transport = true, String $lua_root = '/opt/ood/mod_ood_proxy/lib', From ef587e6930fdf9b27f71400ea4f00e2588a21d33 Mon Sep 17 00:00:00 2001 From: Aday Bujeda Date: Thu, 9 Jan 2025 19:45:00 +0000 Subject: [PATCH 2/3] Fixed formatting in maintenance.enable file resource --- manifests/config.pp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 17a5991..4d83e82 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -95,11 +95,17 @@ } if $openondemand::maintenance_enabled != undef { - file { "/etc/ood/maintenance.enable": - ensure => $openondemand::maintenance_enabled ? { true => 'file', false => 'absent' }, - owner => 'root', - group => 'root', - mode => '0644', + if $openondemand::maintenance_enabled { + $maintenance_enable_ensure = 'file' + } else { + $maintenance_enable_ensure = 'absent' + } + + file { '/etc/ood/maintenance.enable': + ensure => $openondemand::maintenance_enabled, + owner => 'root', + group => 'root', + mode => '0644', } } From 48bffbf54e43f09da597c67ad5ef11ab0a8d47f2 Mon Sep 17 00:00:00 2001 From: Aday Bujeda Date: Mon, 13 Jan 2025 18:53:47 +0000 Subject: [PATCH 3/3] Remove undef check for maintenance_enabled --- manifests/config.pp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 4d83e82..44a0b96 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -94,19 +94,17 @@ mode => '0755', } - if $openondemand::maintenance_enabled != undef { - if $openondemand::maintenance_enabled { - $maintenance_enable_ensure = 'file' - } else { - $maintenance_enable_ensure = 'absent' - } + if $openondemand::maintenance_enabled { + $maintenance_enable_ensure = 'file' + } else { + $maintenance_enable_ensure = 'absent' + } - file { '/etc/ood/maintenance.enable': - ensure => $openondemand::maintenance_enabled, - owner => 'root', - group => 'root', - mode => '0644', - } + file { '/etc/ood/maintenance.enable': + ensure => $maintenance_enable_ensure, + owner => 'root', + group => 'root', + mode => '0644', } file { '/etc/ood/config':