From 49aacb2fbedceaa7229f95f0f1be0dff9407bf4d Mon Sep 17 00:00:00 2001
From: matthew wall <mwall@weewx-debian10>
Date: Wed, 29 Nov 2023 08:26:49 -0500
Subject: [PATCH] remove duplicate apache configs.  no need to track the
 various os directory variants for apache.  added 2.4 syntax, but continue
 with 2.2 since compat handles it.

---
 src/weewx_data/util/apache/conf-available/weewx.conf | 6 ------
 src/weewx_data/util/apache/{conf.d => }/weewx.conf   | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/weewx_data/util/apache/conf-available/weewx.conf
 rename src/weewx_data/util/apache/{conf.d => }/weewx.conf (68%)

diff --git a/src/weewx_data/util/apache/conf-available/weewx.conf b/src/weewx_data/util/apache/conf-available/weewx.conf
deleted file mode 100644
index 41c2e76e..00000000
--- a/src/weewx_data/util/apache/conf-available/weewx.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Alias /weewx /home/weewx/public_html
-<Directory /home/weewx/public_html>
-  Options FollowSymlinks
-  AllowOverride None
-  Require all granted
-</Directory>
diff --git a/src/weewx_data/util/apache/conf.d/weewx.conf b/src/weewx_data/util/apache/weewx.conf
similarity index 68%
rename from src/weewx_data/util/apache/conf.d/weewx.conf
rename to src/weewx_data/util/apache/weewx.conf
index 90a4f69e..c21fc7bb 100644
--- a/src/weewx_data/util/apache/conf.d/weewx.conf
+++ b/src/weewx_data/util/apache/weewx.conf
@@ -2,6 +2,9 @@ Alias /weewx /home/weewx/public_html
 <Directory /home/weewx/public_html>
   Options FollowSymlinks
   AllowOverride None
+# This is apache 2.2 syntax
   Order allow,deny
   Allow from all
+# This is apache 2.4 syntax
+#  Require all granted
 </Directory>