From 1dd070d54db6455da0d852ddccccbd43bbd53571 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Wed, 18 Jan 2023 14:42:21 +0100
Subject: [PATCH] Restore file removed from upstream we need

---
 Dockerfile       |  2 +-
 icingaweb2.patch | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4b147f5..02debc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,8 +38,8 @@ COPY icinga-php /usr/share/icinga-php
 COPY icinga-L10n /usr/share/icinga-L10n
 COPY php.ini /etc/php/7.4/cli/conf.d/99-docker.ini
 
-RUN ["ln", "-vs", "/usr/share/icingaweb2/packages/files/apache/icingaweb2.conf", "/etc/apache2/conf-enabled/"]
 RUN ["ln", "-vs", "/usr/share/icingaweb2/bin/icingacli", "/usr/local/bin/"]
+RUN ["icingacli", "setup", "config", "webserver", "apache", "--path=/", "--file=/etc/apache2/conf-enabled/icingaweb2.conf"]
 
 USER www-data
 CMD ["bash", "-eo", "pipefail", "-c", ". /etc/apache2/envvars; exec apache2 -DFOREGROUND"]
diff --git a/icingaweb2.patch b/icingaweb2.patch
index 8e1462e..c061aa5 100644
--- a/icingaweb2.patch
+++ b/icingaweb2.patch
@@ -53,29 +53,3 @@ Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+
        <p><?= sprintf(
          $this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),
          '<a href="http://docs.icinga.com/">' . $this->translate('Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
---- packages/files/apache/icingaweb2.conf
-+++ packages/files/apache/icingaweb2.conf
-@@ -1,4 +1,4 @@
--Alias /icingaweb2 "/usr/share/icingaweb2/public"
-+Alias / "/usr/share/icingaweb2/public/"
- 
- # Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
- #<IfVersion < 2.4>
-@@ -34,7 +34,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
- 
-     <IfModule mod_rewrite.c>
-         RewriteEngine on
--        RewriteBase /icingaweb2/
-+        RewriteBase /
-         RewriteCond %{REQUEST_FILENAME} -s [OR]
-         RewriteCond %{REQUEST_FILENAME} -l [OR]
-         RewriteCond %{REQUEST_FILENAME} -d
-@@ -44,7 +44,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
- 
-     <IfModule !mod_rewrite.c>
-         DirectoryIndex error_norewrite.html
--        ErrorDocument 404 /icingaweb2/error_norewrite.html
-+        ErrorDocument 404 /error_norewrite.html
-     </IfModule>
- 
- # Remove comments if you want to use PHP FPM and your Apache version