Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue that proxy port is removed if it matches the standard port #3027

Merged
merged 3 commits into from
Jan 9, 2025

Conversation

Grotax
Copy link
Member

@Grotax Grotax commented Jan 5, 2025

Summary

Add debug logging for the proxy configuration

And add nano to the docker image to edit files.

Checklist

@Grotax Grotax added the Skip-Changelog No changelog update is required, minor change label Jan 5, 2025
@Grotax Grotax changed the title Proxy Add debug logging to proxy setup Jan 5, 2025
@Grotax Grotax force-pushed the proxy branch 2 times, most recently from eb171d1 to df01931 Compare January 5, 2025 11:53
@@ -5,7 +5,7 @@ FROM nextcloud:30-apache

COPY entrypoint.sh /

RUN apt-get update && apt-get install -y sqlite3
RUN apt-get update && apt-get install -y sqlite3 nano
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is user preference, do we really want to install this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I just want a proper setup within the docker container to do stuff, I will drop it from this PR and check for alternatives

@Grotax Grotax force-pushed the proxy branch 2 times, most recently from db5f551 to aad721c Compare January 8, 2025 11:09
@Grotax Grotax changed the title Add debug logging to proxy setup Fix issue that proxy port is removed if it matches the standard port Jan 8, 2025
@Grotax Grotax added API Impact API/Backend code and removed Skip-Changelog No changelog update is required, minor change labels Jan 8, 2025
Grotax added 3 commits January 8, 2025 12:16
Signed-off-by: Benjamin Brahmer <[email protected]>
Signed-off-by: Benjamin Brahmer <[email protected]>
lib/Config/FetcherConfig.php Outdated Show resolved Hide resolved
@Grotax Grotax merged commit 3cae601 into master Jan 9, 2025
24 checks passed
@Grotax Grotax deleted the proxy branch January 9, 2025 10:14
Grotax added a commit that referenced this pull request Jan 10, 2025
Changed
- add explanations for the individual values in the feed information table (#3031)
- show error message from `opml` import in web-ui (#3036)
- disable new setting "nextUpdateTime" introduced in #2999 by default (#3039)

Fixed
- fix proxy port removed if standard port for the protocol (#3027)
- background updater may stumble over invalid datetime strings from feeds (#3028)

Signed-off-by: Benjamin Brahmer <[email protected]>
@Grotax Grotax mentioned this pull request Jan 10, 2025
Grotax added a commit that referenced this pull request Jan 10, 2025
Changed
- add explanations for the individual values in the feed information table (#3031)
- show error message from `opml` import in web-ui (#3036)
- disable new setting "nextUpdateTime" introduced in #2999 by default (#3039)

Fixed
- fix proxy port removed if standard port for the protocol (#3027)
- background updater may stumble over invalid datetime strings from feeds (#3028)

Signed-off-by: Benjamin Brahmer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API Impact API/Backend code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants