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 hook encryption with cron job #31771

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Fix hook encryption with cron job #31771

merged 1 commit into from
Jun 10, 2022

Conversation

CarlSchwan
Copy link
Member

@CarlSchwan CarlSchwan commented Mar 31, 2022

Make sure the setup fs is set before using the Update service

Fix #29674
Fix nextcloud/sharelisting#284
Fix nextcloud/sharelisting#186

Signed-off-by: Carl Schwan carl@carlschwan.eu

@CarlSchwan CarlSchwan self-assigned this Mar 31, 2022
@CarlSchwan CarlSchwan marked this pull request as draft March 31, 2022 09:22
@CarlSchwan CarlSchwan force-pushed the fix/hook-encryption-cron branch from efd3b02 to 8f9b2af Compare March 31, 2022 17:56
@CarlSchwan CarlSchwan marked this pull request as ready for review March 31, 2022 17:56
@CarlSchwan CarlSchwan force-pushed the fix/hook-encryption-cron branch from 8f9b2af to 3fec1d1 Compare March 31, 2022 17:57
@PVince81 PVince81 requested a review from icewind1991 April 4, 2022 13:15
@CarlSchwan CarlSchwan requested a review from artonge April 5, 2022 09:41
artonge
artonge previously approved these changes Apr 5, 2022
@CarlSchwan
Copy link
Member Author

Code is a bit horrible and any suggestions on how to improve it are welcome

@PVince81
Copy link
Member

@icewind1991 would be good if you could check this, to confirm that there will be no side effects. thanks

@icewind1991
Copy link
Member

I think the teardown isn't required and there is less chance of side effects without it

@CarlSchwan CarlSchwan force-pushed the fix/hook-encryption-cron branch from 4ba3f3d to 854d357 Compare May 30, 2022 08:02
@CarlSchwan
Copy link
Member Author

I think the teardown isn't required and there is less chance of side effects without it

done :)

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 added the 3. to review Waiting for reviews label May 30, 2022
@PVince81
Copy link
Member

PVince81 commented Jun 7, 2022

/rebase

Make sure the setup fs is set before using the Update service

Fix #29674

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@nextcloud-command nextcloud-command force-pushed the fix/hook-encryption-cron branch from 854d357 to 5907bba Compare June 7, 2022 15:38
@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 7, 2022
@PVince81 PVince81 merged commit 85cc867 into master Jun 10, 2022
@PVince81 PVince81 deleted the fix/hook-encryption-cron branch June 10, 2022 14:28
@PVince81
Copy link
Member

/backport to stable24

@PVince81
Copy link
Member

/backport to stable23

@PVince81
Copy link
Member

/backport to stable22

@PVince81
Copy link
Member

@CarlSchwan backport to NC <= 23 will need manual adjustments because the FS setup is using the old API, please have a look

@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable23 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable22 failed. Please do this backport manually.

@PVince81
Copy link
Member

@CarlSchwan please take care of the backports

@CarlSchwan
Copy link
Member Author

Backports #32987 #32986

@Ecmoechr
Copy link

are comments disappearing here? interesting . . .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
8 participants