update to icinga-web2-2.11.4

unfortunately the sample Apache httpd config files were removed from the
icingaweb2 distfile in a packaging reorganisation ("moved to the packaging
repository", which appears to be non-public), so copy the files from the
previous version.
This commit is contained in:
sthen 2023-01-27 13:55:52 +00:00
parent 2be5c59c32
commit 3de70aa009
10 changed files with 164 additions and 163 deletions

View File

@ -2,7 +2,7 @@ COMMENT = next-generation web UI for icinga
GH_ACCOUNT = Icinga
GH_PROJECT = icingaweb2
GH_TAGNAME = v2.11.3
GH_TAGNAME = v2.11.4
PKGNAME = icinga-web2-${GH_TAGNAME:S/v//}
MODULES= lang/php
@ -25,14 +25,12 @@ do-configure:
${WRKSRC}/bin/icingacli
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/icinga-web2 \
${PREFIX}/conf/modules.sample
${INSTALL_DATA_DIR} ${PREFIX}/icinga-web2 ${PREFIX}/conf/modules.sample
${SUBST_DATA} \
${FILESDIR}/icingaweb2.conf ${PREFIX}/conf/modules.sample/icingaweb2.conf.dist \
${FILESDIR}/icingaweb2.fpm.conf ${PREFIX}/conf/modules.sample/icingaweb2.fpm.conf.dist
cd ${WRKSRC}; pax -rw ./ ${PREFIX}/icinga-web2/
rm -r ${PREFIX}/icinga-web2/test
${SUBST_CMD} ${PREFIX}/icinga-web2/packages/files/apache/*conf
find ${PREFIX}/icinga-web2 \( -name '*${PATCHORIG}' \
-or -name '*.beforesubst' \) -delete
ln -s ${TRUEPREFIX}/icinga-web2/bin/icingacli \
${WRKINST}/usr/local/bin/
find ${PREFIX}/icinga-web2 \( -name '*${PATCHORIG}' -or -name '*.beforesubst' \) -delete
ln -s ${TRUEPREFIX}/icinga-web2/bin/icingacli ${WRKINST}/usr/local/bin/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (icingaweb2-2.11.3.tar.gz) = 2ca8RStuyxxGcTu7kSJeG1cGy8hcWFJU6mjYH4Wk/F8=
SIZE (icingaweb2-2.11.3.tar.gz) = 11437384
SHA256 (icingaweb2-2.11.4.tar.gz) = 6ZRL9Xo78zn9a9hi3a+IWZG4tFzo8FeYa3Mr+Vs/EU4=
SIZE (icingaweb2-2.11.4.tar.gz) = 11381515

View File

@ -0,0 +1,60 @@
Alias /icingaweb2 "${TRUEPREFIX}/icinga-web2/public"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4>
# # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <LocationMatch "^{urlPath}/(.*\.php)$">
# ProxyPassMatch "fcgi://127.0.0.1:9000/{documentRoot}/$1"
# </LocationMatch>
#</IfVersion>
<Directory "${TRUEPREFIX}/icinga-web2/public">
Options SymLinksIfOwnerMatch
AllowOverride None
DirectoryIndex index.php
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
SetEnv ICINGAWEB_CONFIGDIR "${TRUEPREFIX}/etc/icingaweb2"
EnableSendfile Off
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteBase /icingaweb2/
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
</IfModule>
<IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html
ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule>
# Remove comments if you want to use PHP FPM and your Apache version
# is greater than or equal to 2.4
# <IfVersion >= 2.4>
# # Forward PHP requests to FPM
# SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
# <FilesMatch "\.php$">
# SetHandler "proxy:fcgi://127.0.0.1:9000"
# ErrorDocument 503 {urlPath}/error_unavailable.html
# </FilesMatch>
# </IfVersion>
</Directory>

View File

@ -0,0 +1,57 @@
Alias /icingaweb2 "${TRUEPREFIX}/icinga-web2/public"
<IfVersion < 2.4>
# Forward PHP requests to FPM
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
<LocationMatch "^/icingaweb2/(.*\.php)$">
ProxyPassMatch "fcgi://127.0.0.1:9000${TRUEPREFIX}/icinga-web2/public/$1"
</LocationMatch>
</IfVersion>
<Directory "${TRUEPREFIX}/icinga-web2/public">
Options SymLinksIfOwnerMatch
AllowOverride None
DirectoryIndex index.php
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
SetEnv ICINGAWEB_CONFIGDIR "${TRUEPREFIX}/etc/icingaweb2"
EnableSendfile Off
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteBase /icingaweb2/
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
</IfModule>
<IfModule !mod_rewrite.c>
DirectoryIndex error_norewrite.html
ErrorDocument 404 /icingaweb2/error_norewrite.html
</IfModule>
<IfVersion >= 2.4>
# Forward PHP requests to FPM
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
<FilesMatch "\.php$">
SetHandler "proxy:fcgi://127.0.0.1:9000"
ErrorDocument 503 /icingaweb2/error_unavailable.html
</FilesMatch>
</IfVersion>
</Directory>

View File

@ -0,0 +1,9 @@
Index: bin/icingacli
--- bin/icingacli.orig
+++ bin/icingacli
@@ -4,4 +4,4 @@
require_once dirname(__DIR__) . '/library/Icinga/Application/Cli.php';
-Icinga\Application\Cli::start()->dispatch();
+Icinga\Application\Cli::start('/var/www/icinga-web2')->dispatch();

View File

@ -15,9 +15,9 @@ Index: modules/setup/application/views/scripts/form/setup-welcome.phtml
+$cliPath = '/var/www/icinga-web2/bin/icingacli';
$groupadd = null;
if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')) {
@@ -81,11 +81,11 @@ if (! (false === ($distro = Platform::getLinuxDistro(1
); ?></p>
$docker = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE');
@@ -84,11 +84,11 @@ if (! (false === ($distro = Platform::getLinuxDistro(1
<?php if (! $docker): ?>
<p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>
<ul>
- <li><?= $this->translate('A system group called "icingaweb2" exists'); ?></li>
@ -31,18 +31,20 @@ Index: modules/setup/application/views/scripts/form/setup-welcome.phtml
<?php endif ?>
</ul>
<?php if (! ($groupadd === null || $usermod === null)) { ?>
@@ -96,12 +96,12 @@ if (! (false === ($distro = Platform::getLinuxDistro(1
<?php } ?>
<p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
@@ -101,14 +101,14 @@ if (! (false === ($distro = Platform::getLinuxDistro(1
<?php endif; ?>
<div class="code">
<?php if (! $docker): ?>
- <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
+ <span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group _icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
<?php endif; ?>
<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</span>
</div>
<?php if (! $docker): ?>
<p><?= $this->translate('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
<div class="code">
- <span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> -s /bin/sh -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
+ <span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> -s /bin/sh -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp _icingaweb2 <?= dirname($setupTokenPath); ?>; openssl rand -base64 12 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
</div>
<?php endif; ?>
<p><?= sprintf(
$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),

View File

@ -1,27 +0,0 @@
Index: packages/files/apache/icingaweb2.conf
--- packages/files/apache/icingaweb2.conf.orig
+++ packages/files/apache/icingaweb2.conf
@@ -1,4 +1,4 @@
-Alias /icingaweb2 "/usr/share/icingaweb2/public"
+Alias /icingaweb2 "${TRUEPREFIX}/icinga-web2/public"
# Remove comments if you want to use PHP FPM and your Apache version is older than 2.4
#<IfVersion < 2.4>
@@ -9,7 +9,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
# </LocationMatch>
#</IfVersion>
-<Directory "/usr/share/icingaweb2/public">
+<Directory "${TRUEPREFIX}/icinga-web2/public">
Options SymLinksIfOwnerMatch
AllowOverride None
@@ -28,7 +28,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
Allow from all
</IfModule>
- SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
+ SetEnv ICINGAWEB_CONFIGDIR "${TRUEPREFIX}/etc/icingaweb2"
EnableSendfile Off

View File

@ -1,30 +0,0 @@
Index: packages/files/apache/icingaweb2.fpm.conf
--- packages/files/apache/icingaweb2.fpm.conf.orig
+++ packages/files/apache/icingaweb2.fpm.conf
@@ -1,14 +1,14 @@
-Alias /icingaweb2 "/usr/share/icingaweb2/public"
+Alias /icingaweb2 "${TRUEPREFIX}/icinga-web2/public"
<IfVersion < 2.4>
# Forward PHP requests to FPM
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
<LocationMatch "^/icingaweb2/(.*\.php)$">
- ProxyPassMatch "fcgi://127.0.0.1:9000/usr/share/icingaweb2/public/$1"
+ ProxyPassMatch "fcgi://127.0.0.1:9000${TRUEPREFIX}/icinga-web2/public/$1"
</LocationMatch>
</IfVersion>
-<Directory "/usr/share/icingaweb2/public">
+<Directory "${TRUEPREFIX}/icinga-web2/public">
Options SymLinksIfOwnerMatch
AllowOverride None
@@ -27,7 +27,7 @@ Alias /icingaweb2 "/usr/share/icingaweb2/public"
Allow from all
</IfModule>
- SetEnv ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
+ SetEnv ICINGAWEB_CONFIGDIR "${TRUEPREFIX}/etc/icingaweb2"
EnableSendfile Off

View File

@ -1,9 +0,0 @@
Index: packages/files/bin/icingacli
--- packages/files/bin/icingacli.orig
+++ packages/files/bin/icingacli
@@ -4,4 +4,4 @@
require_once '/usr/share/php/Icinga/Application/Cli.php';
-Icinga\Application\Cli::start('/usr/share/icingaweb2')->dispatch();
+Icinga\Application\Cli::start('/var/www/icinga-web2')->dispatch();

View File

@ -3,14 +3,16 @@
@extraunexec rm -rf %D/etc/icingaweb2/*
@extraunexec rm -rf %D/icinga-web2/tmp/*
conf/modules.sample/
conf/modules.sample/icingaweb2.conf.dist
@sample conf/modules.sample/icingaweb2.conf
conf/modules.sample/icingaweb2.fpm.conf.dist
@sample conf/modules.sample/icingaweb2.fpm.conf
icinga-web2/
icinga-web2/.mailmap
icinga-web2/AUTHORS
icinga-web2/CHANGELOG.md
icinga-web2/CONTRIBUTING.md
icinga-web2/COPYING
icinga-web2/LICENSE
icinga-web2/README.md
icinga-web2/RELEASE.md
icinga-web2/VERSION
icinga-web2/application/
icinga-web2/application/VERSION
@ -260,21 +262,6 @@ icinga-web2/etc/bash_completion.d/
@sample ${SYSCONFDIR}/bash_completion.d/
icinga-web2/etc/bash_completion.d/icingacli
@sample ${SYSCONFDIR}/bash_completion.d/icingacli
icinga-web2/etc/schema/
icinga-web2/etc/schema/mysql-upgrades/
icinga-web2/etc/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
icinga-web2/etc/schema/mysql-upgrades/2.11.0.sql
icinga-web2/etc/schema/mysql-upgrades/2.5.0.sql
icinga-web2/etc/schema/mysql-upgrades/2.9.0.sql
icinga-web2/etc/schema/mysql-upgrades/2.9.1.sql
icinga-web2/etc/schema/mysql.schema.sql
icinga-web2/etc/schema/pgsql-upgrades/
icinga-web2/etc/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql
icinga-web2/etc/schema/pgsql-upgrades/2.11.0.sql
icinga-web2/etc/schema/pgsql-upgrades/2.5.0.sql
icinga-web2/etc/schema/pgsql-upgrades/2.9.0.sql
icinga-web2/etc/schema/pgsql-upgrades/2.9.1.sql
icinga-web2/etc/schema/pgsql.schema.sql
icinga-web2/icingaweb2.ruleset.xml
icinga-web2/library/
icinga-web2/library/Icinga/
@ -1980,7 +1967,6 @@ icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/CREDITS
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/LICENSE.txt
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/README.md
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/RELEASE.md
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/UPGRADING.md
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/bin/
icinga-web2/library/vendor/dompdf/vendor/masterminds/html5/bin/entities.php
@ -2758,29 +2744,6 @@ icinga-web2/modules/monitoring/public/css/tables.less
icinga-web2/modules/monitoring/public/js/
icinga-web2/modules/monitoring/public/js/module.js
icinga-web2/modules/monitoring/run.php
icinga-web2/modules/monitoring/test/
icinga-web2/modules/monitoring/test/php/
icinga-web2/modules/monitoring/test/php/application/
icinga-web2/modules/monitoring/test/php/application/views/
icinga-web2/modules/monitoring/test/php/application/views/helpers/
icinga-web2/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
icinga-web2/modules/monitoring/test/php/application/views/helpers/PluginOutputTest.php
icinga-web2/modules/monitoring/test/php/library/
icinga-web2/modules/monitoring/test/php/library/Monitoring/
icinga-web2/modules/monitoring/test/php/library/Monitoring/Object/
icinga-web2/modules/monitoring/test/php/library/Monitoring/Object/MacroTest.php
icinga-web2/modules/monitoring/test/php/library/Monitoring/Plugin/
icinga-web2/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataSetTest.php
icinga-web2/modules/monitoring/test/php/library/Monitoring/Plugin/PerfdataTest.php
icinga-web2/modules/monitoring/test/php/library/Monitoring/Plugin/ThresholdRangeTest.php
icinga-web2/modules/monitoring/test/php/library/Monitoring/Web/
icinga-web2/modules/monitoring/test/php/library/Monitoring/Web/Rest/
icinga-web2/modules/monitoring/test/php/library/Monitoring/Web/Rest/RestRequestTest.php
icinga-web2/modules/monitoring/test/php/regression/
icinga-web2/modules/monitoring/test/php/regression/Bug11728Test.php
icinga-web2/modules/monitoring/test/php/regression/Bug11796Test.php
icinga-web2/modules/monitoring/test/php/regression/Bug6088Test.php
icinga-web2/modules/monitoring/test/php/regression/Bug7043Test.php
icinga-web2/modules/setup/
icinga-web2/modules/setup/application/
icinga-web2/modules/setup/application/clicommands/
@ -2854,17 +2817,6 @@ icinga-web2/modules/setup/library/Setup/Webserver.php
icinga-web2/modules/setup/library/Setup/Webserver/Apache.php
icinga-web2/modules/setup/library/Setup/Webserver/Nginx.php
icinga-web2/modules/setup/module.info
icinga-web2/modules/setup/test/
icinga-web2/modules/setup/test/php/
icinga-web2/modules/setup/test/php/library/
icinga-web2/modules/setup/test/php/library/Setup/
icinga-web2/modules/setup/test/php/library/Setup/RequirementSetTest.php
icinga-web2/modules/test/
icinga-web2/modules/test/application/
icinga-web2/modules/test/application/clicommands/
icinga-web2/modules/test/application/clicommands/PhpCommand.php
icinga-web2/modules/test/module.info
icinga-web2/modules/test/phpunit.xml
icinga-web2/modules/translation/
icinga-web2/modules/translation/application/
icinga-web2/modules/translation/application/clicommands/
@ -2889,32 +2841,6 @@ icinga-web2/modules/translation/library/Translation/Cli/TranslationCommand.php
icinga-web2/modules/translation/library/Translation/Util/
icinga-web2/modules/translation/library/Translation/Util/GettextTranslationHelper.php
icinga-web2/modules/translation/module.info
icinga-web2/packages/
icinga-web2/packages/RPM.md
icinga-web2/packages/files/
icinga-web2/packages/files/apache/
icinga-web2/packages/files/apache/icingaweb2.conf
@sample conf/modules.sample/icingaweb2.conf
icinga-web2/packages/files/apache/icingaweb2.fpm.conf
@sample conf/modules.sample/icingaweb2.fpm.conf
icinga-web2/packages/files/bin/
icinga-web2/packages/files/bin/icingacli
icinga-web2/packages/files/config/
icinga-web2/packages/files/config/modules/
icinga-web2/packages/files/config/modules/doc/
icinga-web2/packages/files/config/modules/doc/config.ini
icinga-web2/packages/files/config/modules/setup/
icinga-web2/packages/files/config/modules/setup/config.ini
icinga-web2/packages/files/config/modules/translation/
icinga-web2/packages/files/config/modules/translation/config.ini
icinga-web2/packages/files/public/
icinga-web2/packages/files/public/index.php
icinga-web2/packages/selinux/
icinga-web2/packages/selinux/icingaweb2.fc
icinga-web2/packages/selinux/icingaweb2.if
icinga-web2/packages/selinux/icingaweb2.sh
icinga-web2/packages/selinux/icingaweb2.te
icinga-web2/phpcs.xml
icinga-web2/public/
icinga-web2/public/css/
icinga-web2/public/css/icinga/
@ -3125,6 +3051,21 @@ icinga-web2/public/js/icinga/timer.js
icinga-web2/public/js/icinga/timezone.js
icinga-web2/public/js/icinga/ui.js
icinga-web2/public/js/icinga/utils.js
icinga-web2/schema/
icinga-web2/schema/mysql-upgrades/
icinga-web2/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql
icinga-web2/schema/mysql-upgrades/2.11.0.sql
icinga-web2/schema/mysql-upgrades/2.5.0.sql
icinga-web2/schema/mysql-upgrades/2.9.0.sql
icinga-web2/schema/mysql-upgrades/2.9.1.sql
icinga-web2/schema/mysql.schema.sql
icinga-web2/schema/pgsql-upgrades/
icinga-web2/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql
icinga-web2/schema/pgsql-upgrades/2.11.0.sql
icinga-web2/schema/pgsql-upgrades/2.5.0.sql
icinga-web2/schema/pgsql-upgrades/2.9.0.sql
icinga-web2/schema/pgsql-upgrades/2.9.1.sql
icinga-web2/schema/pgsql.schema.sql
@mode 700
@owner _icingaweb2
@group _icingaweb2