From b96e6483d34f11887314eed998b75b12a9c60c29 Mon Sep 17 00:00:00 2001
From: Fiona Klute <fiona.klute@gmx.de>
Date: Sun, 7 Apr 2024 03:38:39 +0200
Subject: [PATCH] Actually commit netns.conf snippet

It replaces templating from netns.conf.in, and the .gitignore kept it
hidden until CI failed.
---
 test/apache-conf/.gitignore    | 3 ---
 test/apache-conf/netns.conf    | 2 ++
 test/apache-conf/netns.conf.in | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 test/apache-conf/.gitignore
 create mode 100644 test/apache-conf/netns.conf
 delete mode 100644 test/apache-conf/netns.conf.in

diff --git a/test/apache-conf/.gitignore b/test/apache-conf/.gitignore
deleted file mode 100644
index 7a3ccfef..00000000
--- a/test/apache-conf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-netns.conf
-listen.conf
-required-modules.conf
diff --git a/test/apache-conf/netns.conf b/test/apache-conf/netns.conf
new file mode 100644
index 00000000..73d33363
--- /dev/null
+++ b/test/apache-conf/netns.conf
@@ -0,0 +1,2 @@
+Mutex pthread default
+PidFile apache2-${TEST_NAME}.pid
diff --git a/test/apache-conf/netns.conf.in b/test/apache-conf/netns.conf.in
deleted file mode 100644
index 005d48f3..00000000
--- a/test/apache-conf/netns.conf.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file contains options that are different depending on whether
-# tests use namespaces or not.
-@MUTEX_CONF@
-PidFile	apache2@PID_AFFIX@.pid