Skip to content

ENT-11481: Redirection from HTTP to HTTPS responsibility moved from Apache to PHP #3049

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 14, 2025
Merged

ENT-11481: Redirection from HTTP to HTTPS responsibility moved from Apache to PHP #3049

merged 1 commit into from
Oct 14, 2025

Conversation

aleksandrychev
Copy link
Contributor

No description provided.

@aleksandrychev
Copy link
Contributor Author

@nickanderson can you please help with cfe_enterprise_disable_http_redirect_to_https class? I see we mention it in some places. remove mentions? or keep as is

nickanderson
nickanderson reviewed Oct 2, 2025
View reviewed changes
Copy link
Member

@nickanderson nickanderson left a comment

Choose a reason for hiding this comment

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

There is more to this that's needed. I'll try to get to it today

nickanderson
nickanderson approved these changes Oct 2, 2025
View reviewed changes
Copy link
Member

@nickanderson nickanderson left a comment

Choose a reason for hiding this comment

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

Just minor changes needed. I think this covers it.

MPF.md Outdated

* Added in CFEngine 3.6.0
* Class renamed from `cfe_cfengine_enterprise_enable_plain_http` to `cfe_enterprise_disable_http_redirect_to_https` in CFEngine 3.23.0, 3.21.3
* Redirection responsibility moved from Apache to PHP in CFEngine 3.27.0, 3.24.3, 3.21.8
Copy link
Member

Choose a reason for hiding this comment

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

You mentioned back-porting so I filled out all the upcoming releases here.

@nickanderson
Copy link
Member

Feel free to squash all my commits into yours

aleksandrychev
aleksandrychev commented Oct 3, 2025
View reviewed changes
@aleksandrychev
Copy link
Contributor Author

@nickanderson I fixed directory perms 59c10ca please check if I did it in a proper way. (tested and it works)

nickanderson
nickanderson approved these changes Oct 3, 2025
View reviewed changes
Copy link
Member

@nickanderson nickanderson left a comment

Choose a reason for hiding this comment

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

@aleksandrychev what you have is OK, would work, but I suggested to swap the order to make sure the directory get's created with the correct permissions first.

And I wonder if we should denote this flags directory as "configuration" files for packaging (thinking things like rpm -V )

@aleksandrychev aleksandrychev force-pushed the ENT-11481 branch 2 times, most recently from f8ef5af to 03fab32 Compare October 3, 2025 16:18
@aleksandrychev aleksandrychev changed the title Removed redirect from HTTP to HTTPS in the httpd.conf template Redirection responsibility moved from Apache to PHP Oct 3, 2025
@aleksandrychev aleksandrychev changed the title Redirection responsibility moved from Apache to PHP ENT-11481: Redirection from HTTP to HTTPS responsibility moved from Apache to PHP Oct 3, 2025
nickanderson
nickanderson approved these changes Oct 3, 2025
View reviewed changes
Copy link
Member

@nickanderson nickanderson left a comment

Choose a reason for hiding this comment

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

@craigcomstock @vpodzime any opinion if we should alter packaging to identify this flags directory as contining "Configuration files" ?

vpodzime
vpodzime reviewed Oct 6, 2025
View reviewed changes
@vpodzime
Copy link
Contributor

vpodzime commented Oct 6, 2025

@craigcomstock @vpodzime any opinion if we should alter packaging to identify this flags directory as contining "Configuration files" ?

Do we even "track" the /opt/cfengine/ directory in packaging/packages? Aren't those just local "runtime" files?

@aleksandrychev
Redirection from HTTP to HTTPS responsibility moved from Apache to PHP
1f05749 
ChangeLog: Title
Ticket: ENT-11481

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
@craigcomstock
Copy link
Contributor

@craigcomstock @vpodzime any opinion if we should alter packaging to identify this flags directory as contining "Configuration files" ?

Do we even "track" the /opt/cfengine/ directory in packaging/packages? Aren't those just local "runtime" files?

No. We don't mention /opt/cfengine anywhere in deb or rpm packaging files so I think this is OK as-is.

@craigcomstock
Copy link
Contributor

@aleksandrychev I'll let you merge this if you think it is ready.

@craigcomstock craigcomstock merged commit 37b57d4 into cfengine:master Oct 14, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vpodzime vpodzime vpodzime left review comments

@nickanderson nickanderson nickanderson approved these changes

@craigcomstock craigcomstock craigcomstock approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@aleksandrychev @nickanderson @vpodzime @craigcomstock