From 4f449395a6e975950d5da1a7fbce4ccc49dc3d68 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jul 26 2022 15:17:29 +0000
Subject: Merge branch 'cboltz-pmya' into 'production'


phpMyAdmin moved to /usr/ in 15.4, update apache config

See merge request infra/salt!563
---

diff --git a/salt/profile/phpmyadmin/files/apache-vhost.conf b/salt/profile/phpmyadmin/files/apache-vhost.conf
index 7f6ed57..0521a66 100644
--- a/salt/profile/phpmyadmin/files/apache-vhost.conf
+++ b/salt/profile/phpmyadmin/files/apache-vhost.conf
@@ -4,9 +4,9 @@
 
     AADefaultHatName vhost_phpmyadmin
 
-    DocumentRoot /srv/www/htdocs/phpMyAdmin/
+    DocumentRoot /usr/share/phpMyAdmin/
 
-    <Directory /srv/www/htdocs/phpMyAdmin/>
+    <Directory /usr/share/phpMyAdmin/>
         AuthType Basic
         AuthName "Restricted Resource"
         AuthBasicProvider file