www/caddy: Remove port from subdomain since it is unsupported.

opnsense / plugins

OPNsense plugin collection

https://opnsense.org/

BSD 2-Clause "Simplified" License

810 stars 593 forks source link

www/caddy: Remove port from subdomain since it is unsupported. #4028

Closed Monviech closed 3 weeks ago

Monviech commented 3 weeks ago

Fixes: https://github.com/opnsense/plugins/issues/4024

The subdomain port field has been removed, since it is unsupported. Subdomains track their ports from their parent wildcard domain.
Filling this field out currently will result in site block that does not work properly, since it will not route requests to the upstream.

fichtner commented 3 weeks ago

Merged, thanks!

no-usernames-left commented 3 weeks ago

Is it possible to install this as a hotfix today on OPNsense Business 24.4_8?

fichtner commented 3 weeks ago

Only one way to find out:

# opnsense-patch -c plugins c1d162d5681

If it doesn't apply then nothing bad happens.

Cheers, Franco

no-usernames-left commented 3 weeks ago

Only one way to find out:
# opnsense-patch -c plugins c1d162d5681
If it doesn't apply then nothing bad happens.

Cheers, Franco

Hi Franco,

# opnsense-patch -c plugins c1d162d5681
Fetched c1d162d5681 via https://github.com/opnsense/plugins
1 out of 1 hunks failed while patching opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogSubdomain.xml
No such line 146 in input file, ignoring
3 out of 3 hunks failed while patching opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php
1 out of 2 hunks failed while patching opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
1 out of 1 hunks failed while patching opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
#

How would you suggest I proceed?

fichtner commented 3 weeks ago

@no-usernames-left no cause for concern. code is unaltered if any chunk fails. it looks like 24.4's caddy is a bit more behind than I'd hoped. Let me do a clean backport and report back.

fichtner commented 3 weeks ago

@no-usernames-left there is too much going on at the moment to deliver a clean backport. caddy software was updated to 2.8.4 for the upcoming 24.1.9 and there's some overlap in functionality that I don't want to break on a Friday

Monviech commented 3 weeks ago

@fichtner There is nothing in here that needs to be hotfixed right now. Just leaving the port empty in the subdomain is enough. There are a lot of people who use it like that.

Still surprised it took half a year to notice this. XD

no-usernames-left commented 3 weeks ago

it looks like 24.4's caddy is a bit more behind than I'd hoped.

Could you consider bringing it up to date with 24.1.9's?

that I don't want to break on a Friday

An excellent point.

Still surprised it took half a year to notice this. XD

What can I say, I'm just that good. 😂