From 6ba321a9d72ac13e1835aa7ce244475f9f9cd55b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jun 2026 19:13:01 +0100
Subject: [PATCH] Drop unused php::apache recipe

---
 .github/workflows/test-kitchen.yml |  1 -
 .kitchen.yml                       |  3 ---
 cookbooks/php/metadata.rb          |  1 -
 cookbooks/php/recipes/apache.rb    | 32 ------------------------------
 4 files changed, 37 deletions(-)
 delete mode 100644 cookbooks/php/recipes/apache.rb

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index f4af031de..df2bff52c 100644
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -84,7 +84,6 @@ jobs:
           - oxidized
           - passenger
           - php
-          - php-apache
           - php-fpm
           - planet
           - planet-aws
diff --git a/.kitchen.yml b/.kitchen.yml
index c789adfc4..8745f6f5f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -331,9 +331,6 @@ suites:
   - name: php
     run_list:
       - recipe[php::default]
-  - name: php-apache
-    run_list:
-      - recipe[php::apache]
   - name: php-fpm
     run_list:
       - recipe[php::fpm]
diff --git a/cookbooks/php/metadata.rb b/cookbooks/php/metadata.rb
index db4cfc27a..d4de4c272 100644
--- a/cookbooks/php/metadata.rb
+++ b/cookbooks/php/metadata.rb
@@ -6,5 +6,4 @@ description       "Installs and configures PHP"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "apache"
 depends           "prometheus"
diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
deleted file mode 100644
index dc60248ba..000000000
--- a/cookbooks/php/recipes/apache.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Cookbook:: php
-# Recipe:: apache
-#
-# Copyright:: 2020, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "apache"
-include_recipe "php::fpm"
-
-apache_module "proxy"
-apache_module "proxy_fcgi"
-
-apache_module "php#{node[:php][:version]}" do
-  action :disable
-end
-
-apache_conf "php#{node[:php][:version]}-fpm" do
-  action :enable
-end
-- 
2.47.3