mirrors/docker-icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/docker-icingaweb2.git synced 2025-10-24 05:21:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from Icinga/repair-upstream

Browse Source 
Restore file removed from upstream we need
This commit is contained in:
Alexander Aleksandrovič Klimov 2023-01-26 12:13:39 +01:00 committed by GitHub
commit d169130ecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -38,8 +38,8 @@ COPY icinga-php /usr/share/icinga-php
COPY icinga-L10n /usr/share/icinga-L10n COPY icinga-L10n /usr/share/icinga-L10n
COPY php.ini /etc/php/7.4/cli/conf.d/99-docker.ini 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 ["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 USER www-data
CMD ["bash", "-eo", "pipefail", "-c", ". /etc/apache2/envvars; exec apache2 -DFOREGROUND"] CMD ["bash", "-eo", "pipefail", "-c", ". /etc/apache2/envvars; exec apache2 -DFOREGROUND"]

26
icingaweb2.patch
View File

@ -53,29 +53,3 @@ Icinga Web 2 Docker image | (c) 2020 Icinga GmbH | GPLv2+
<p><?= sprintf( <p><?= sprintf(
$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'), $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 '<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