Sorry for slacking off on this, I'm swamped with a lot of things...
On Sun, Apr 04, 2021 at 11:33:22PM +0200, Michael Wilson wrote:
> I just tried to configure httpd with /icingaweb2 as path. This config seems
> to be working so far:
>
> root "/icinga-web2/public/"
This is awkward, it basically takes over the (virtual) server, so it's
not a snipped that you can just add to your existing config.
I think it's best to bite the bulled and say that you need a new
virtual server for this. With let's encrypt and sni that's not too
terrible I guess.
I think it's worthwhile to have this for 6.9 since we no longer ship
icinga 1, so people might want to switch to icinga 2.
OK?
diff --git Makefile Makefile
index d1ed050fb51..414fa1a1f11 100644
--- Makefile
+++ Makefile
@@ -5,7 +5,7 @@ COMMENT = next-generation web UI for icinga
GH_ACCOUNT = Icinga
GH_PROJECT = icingaweb2
GH_TAGNAME = v2.8.2
-REVISION = 7
+REVISION = 8
PKGNAME = icinga-web2-${GH_TAGNAME:S/v//}
MAINTAINER = Stuart Henderson <stu.po...@spacehopper.org>
diff --git pkg/README pkg/README
index d6d99758ec0..995c7826f0a 100644
--- pkg/README
+++ pkg/README
@@ -73,6 +73,28 @@ Or if you use for php-fpm, use this:
And reload:
# rcctl reload apache2
+An example for base httpd(8), serving directly from the root using the
+above php-fpm section:
+
+ server "icinga.example.com" {
+ listen on * tls port 443
+ tls {
+ certificate "/etc/ssl/icinga.example.com.crt"
+ key "/etc/ssl/private/icinga.example.com.key"
+ }
+
+ root "/icinga-web2/public"
+ directory index "index.php"
+ location "*.php*" {
+ fastcgi socket "/run/php-fpm-icingaweb2.sock"
+ fastcgi param ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
+ }
+
+ location not found "*" {
+ request rewrite "/index.php?$QUERY_STRING"
+ }
+ }
+
- Using icingacli, create the config directory and a token to allow setup:
# ${PREFIX}/icinga-web2/bin/icingacli setup config directory --group
_icingaweb2
>
> location "/icingaweb2/*.php*" {
> request strip 1
> fastcgi socket "/run/php-fpm-icingaweb2.sock"
> fastcgi param ICINGAWEB_CONFIGDIR "/etc/icingaweb2"
> }
>
> location found "/icingaweb2/*" {
> root "/icinga-web2/public/"
> request strip 1
> }
>
> location not found "/icingaweb2/*" {
> request rewrite "/icingaweb2/index.php?$QUERY_STRING"
> }
>
--
I'm not entirely sure you are real.
