From ebaf2b42577c905e6403cc910d715be3aa8f1a6d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 20 Nov 2025 00:19:39 +0000 Subject: [PATCH] Fix apache reload logic for wordpress and mediawiki site resources --- cookbooks/mediawiki/resources/site.rb | 6 +++--- cookbooks/wordpress/resources/site.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index e87c0f5ce..9ac601738 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -53,7 +53,7 @@ property :fpm_min_spare_servers, :kind_of => Integer, :default => 1 property :fpm_max_spare_servers, :kind_of => Integer, :default => 3 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 120 property :fpm_prometheus_port, :kind_of => Integer -property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true +property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => false property :backup_enabled, :kind_of => [TrueClass, FalseClass], :default => true action :create do @@ -495,7 +495,7 @@ action :create do directory site_directory variables :aliases => Array(new_resource.aliases), :private_site => new_resource.private_site - reload_apache false + reload_apache true end # FIXME: needs to run one @@ -545,7 +545,7 @@ end action :delete do apache_site new_resource.site do action :delete - reload_apache false + reload_apache true end declare_resource :directory, site_directory do diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb index 2c07ba31e..833955ac1 100644 --- a/cookbooks/wordpress/resources/site.rb +++ b/cookbooks/wordpress/resources/site.rb @@ -41,7 +41,7 @@ property :fpm_min_spare_servers, :kind_of => Integer, :default => 2 property :fpm_max_spare_servers, :kind_of => Integer, :default => 6 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 300 property :fpm_prometheus_port, :kind_of => Integer -property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true +property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => false action :create do version = new_resource.version || Chef::Wordpress.current_version @@ -187,7 +187,7 @@ action :create do directory site_directory variables :aliases => Array(new_resource.aliases), :urls => new_resource.urls - reload_apache false + reload_apache true end wordpress_plugin "wp-fail2ban" do @@ -227,7 +227,7 @@ action :delete do apache_site new_resource.site do action :delete - reload_apache false + reload_apache true end declare_resource :directory, site_directory do -- 2.39.5