Skip to content

Tweaks for the webserver port#1609

Merged
DL6ER merged 3 commits into
development-v6from
tweak/webserver_port
Aug 1, 2023
Merged

Tweaks for the webserver port#1609
DL6ER merged 3 commits into
development-v6from
tweak/webserver_port

Conversation

@DL6ER

@DL6ER DL6ER commented Jul 29, 2023

Copy link
Copy Markdown
Member

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


  1. Enable SSL/TLS by default (FTL can generate a self-signed certificate with the strongest ECC curve of the NSA Suite B by itself on demand)
  2. Initialized webserver ports dynamically depending on whether ports 80 and 443 are already taken by other services on the machine. This initialization is only done once - when either importing from a v5.x installation (setupVars.conf, pihole-FTL.conf and friends) or when this is a completely fresh installation. The result of this is printed to the log file (which ports are being used and written to the config file)

I have only been able to do some superficial testing myself, but it should be rather easy once an appropriate docker container is available.

@DL6ER DL6ER requested a review from a team July 29, 2023 16:33
DL6ER added 2 commits July 30, 2023 21:48
Signed-off-by: DL6ER <dl6er@dl6er.de>
… and 433 are already taken on a system

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER force-pushed the tweak/webserver_port branch from 88dde02 to 70bb611 Compare July 30, 2023 19:48
@DL6ER

DL6ER commented Jul 30, 2023

Copy link
Copy Markdown
Member Author

Rebased on latest development-v6

@yubiuser

Copy link
Copy Markdown
Member

This will need some changes on various places in the code to change the default (sometimes only comments) from 8080 > 80. You could cherry-pick and adjust from #1608

Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER

DL6ER commented Aug 1, 2023

Copy link
Copy Markdown
Member Author

I cherry-picked the mentioned commit but reverted the changes to src/webserver/civetweb/civetweb.c as this is an external file where changing the comments would anyway be undone in future upgrades.

@DL6ER DL6ER merged commit 1c50611 into development-v6 Aug 1, 2023
@DL6ER DL6ER deleted the tweak/webserver_port branch August 1, 2023 19:35
@yubiuser yubiuser mentioned this pull request Aug 1, 2023
1 task
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants