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.

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

tt-rss: upgrade to 20210902 + migrate to maria DB 10 + add support for DSM 7 #4923

Merged
merged 12 commits into from
Oct 2, 2022
Merged

tt-rss: upgrade to 20210902 + migrate to maria DB 10 + add support for DSM 7 #4923

merged 12 commits into from
Oct 2, 2022

Conversation

smaarn
Copy link
Contributor

@smaarn smaarn commented Oct 17, 2021 •
edited by hgy59
Loading

Motivation: Being able to operate under DSM 7 required Maria DB upgrade
Linked issues: #4524

Supersedes #4840
Closes #4473

Bump required PHP version to 7.2
Prefer using resource mechanism to inject db
Switch to Maria DB 10 and rely on its automatic Maria DB 5 => Maria DB 10 migration process
Fix initial installation phase which should trigger the schema update

Checklist

  • Build rule all-supported completed successfully
  • Package upgrade completed successfully
  • New installation of package completed successfully

Tested scenarii

  • Upgrade DSM 6 => DSM 7
  • DSM 7 Upgrade as is (e.g. reinstalling the package)
  • DSM 7 Installation from scratch

Test packages can be found here: https://github.com/smaarn/spksrc/releases/tag/tt-rss_20210902

@smaarn smaarn mentioned this pull request Oct 17, 2021
Closed
3 tasks
@smaarn smaarn marked this pull request as ready for review October 17, 2021 16:03
@smaarn smaarn changed the title Tiny Tiny RSS: Migrate to Maria DB 10 + Add support for DSM 7 Tiny Tiny RSS: Upgrade to 20210902 + Migrate to Maria DB 10 + Add support for DSM 7 Oct 17, 2021
@smaarn smaarn changed the title Tiny Tiny RSS: Upgrade to 20210902 + Migrate to Maria DB 10 + Add support for DSM 7 tt-rss: Upgrade to 20210902 + Migrate to Maria DB 10 + Add support for DSM 7 Oct 24, 2021
@smaarn smaarn changed the title tt-rss: Upgrade to 20210902 + Migrate to Maria DB 10 + Add support for DSM 7 tt-rss: upgrade to 20210902 + migrate to maria DB 10 + add support for DSM 7 Oct 24, 2021
@ymartin59
Copy link
Contributor

@smaarn Great job.
I have a "personal" request. I would like to avoid to run MariaDB when PostgreSQL (included in DSM) is available for an application.
Would it be possible to select our database (mariadb or embedded postgresql) in setup wizard? CC @hgy59 @publicarray

@smaarn
Copy link
Contributor Author

smaarn commented Nov 1, 2021

That could be an option. There are several things to consider on which feedbacks would be much appreciated:

  1. Is there a real officially supported pgsql version I should be considering ?
  2. Should I try making the mysql dependency optional ?
  3. Should I try performing migration automatically or should this be done only on new installation ?

Adding support for pgsql is soon going to be mandatory anyway since it's only being supported for maintenance and bugfixes.

@smaarn smaarn force-pushed the feat/tt-rss/dsm7-support branch 2 times, most recently from df86cdb to d23eae8 Compare November 15, 2021 21:42
@hgy59 hgy59 mentioned this pull request Nov 26, 2021
Open
@ewoks
Copy link

ewoks commented Dec 23, 2021

just a friendly poke for visibility here... As I see changes are approved, but there is no merge yet. Any specific reason for it or we can move forward and add few checkboxes in the table next to tt-rss here ?

@hgy59
Copy link
Contributor

hgy59 commented Dec 23, 2021

@smaarn you need to rebase to master to fix the dsmappname in the INFO file.
This will bring back the tt-rss link to the DSM Applications fixed with #4993.

hgy59
hgy59 reviewed Dec 23, 2021
View reviewed changes
spk/tt-rss/src/conf/resource Outdated Show resolved Hide resolved
@smaarn smaarn marked this pull request as draft December 24, 2021 09:34
@smaarn
Copy link
Contributor Author

smaarn commented Dec 24, 2021

Flagged this PR as draft until I complete testing on the newer version which is

  • Using apache 2.4
  • Rebased

@smaarn smaarn marked this pull request as ready for review December 24, 2021 14:43
@smaarn
Copy link
Contributor Author

smaarn commented Dec 24, 2021

Latest binaries have been published here https://github.com/smaarn/spksrc/releases/tag/tt-rss_20210902_rc2

@smaarn
Copy link
Contributor Author

smaarn commented Dec 24, 2021

@smaarn Great job.
I have a "personal" request. I would like to avoid to run MariaDB when PostgreSQL (included in DSM) is available for an application.
Would it be possible to select our database (mariadb or embedded postgresql) in setup wizard? CC @hgy59 @publicarray

Database selection could totally be possible in setup wizard but there is a mechanism which may prove to be awkward is the dependency selection mechanism which is not really working here.

TBH I wonder if, given the complexity, it wouldn't be simplier to

  1. have two packages (since now we're working on a "no-arch" package), one dedicated for mysql and one for pgsql, both replacing the former and conflicting with each other.
  2. deprecate the -mysql one (if that's even possible)

I will try to have this done next year if you don't mind and would rather have this taken offside from this PR. WDYT ?

@smaarn smaarn requested a review from hgy59 December 24, 2021 15:23
@smaarn
Copy link
Contributor Author

smaarn commented Dec 24, 2021

@smaarn you need to rebase to master to fix the dsmappname in the INFO file.
This will bring back the tt-rss link to the DSM Applications fixed with #4993.

@hgy59 just tested and it's indeed back :)

@smaarn
Copy link
Contributor Author

smaarn commented Feb 26, 2022

Out of curiosity, is there anything specific blocking this PR ? If yes, is there anything I can do to help ?

The postgresql project is indeed a topic but shouldn't it be considered separately ?

@cc250080
Copy link

Any issue with this PR I am not seeing?

@smaarn
Copy link
Contributor Author

smaarn commented Apr 3, 2022

Rebased at head

@smaarn
Copy link
Contributor Author

smaarn commented Apr 30, 2022

Had to rebase at head since there were conflicts.

@smaarn
Copy link
Contributor Author

smaarn commented May 21, 2022

Rebased @ head to make sure to keep up with changes on the master branch.

@smaarn
Copy link
Contributor Author

smaarn commented Jul 19, 2022

Rebased @ head to handle conflict in merge.

Any objection to my merging ? (Knowing that obviously "just merging" won't be sufficient but at least it's a first towards releasing :) )

I am currently working on making the postgresql adaptation but I don't believe it would be relevant to mix it with this MR (which already changes a few things...)

smaarn and others added 12 commits October 2, 2022 14:49
@smaarn
tt-rss: updated 20201114 -> 20210306
b3d1a4a 
Bump required PHP version to 7.2
Define configuration version file
Prefer using resource mechanism to inject db
Fix initial installation phase which should trigger the schema update
Fix installation procedure which could be failing when running as http user
Switched to github mirror repository
@smaarn
tt-rss: upgrade 20210306 => 20210902
cc7eb13 
Migrate to use Maria DB 10 (required for DSM 7)
Remove any usage of mysql ports (now using sockets only)
Removed no longer supported environments, reworked logs and updated changelog
Add explicit support for extra `TTRSS_MYSQL_DB_SOCKET` parameter
Rollback to using explicit SPK_REV logic in upgrade mechanisms
Remove useless stop calls
@smaarn
tt-rss: add support for DSM 7
addb007 
Switched to `service-setup` framework
Added DSM 7 switches
Fixed pre_upgrade to be "safe"
Fix DB_TYPE configuration migration
Remove no longer required busybox and var folder initialization procedures
Ensure sc-tt-rss is attached to `http` group
@smaarn
Remove duplicate SYSTEM_GROUP definition
8c6bbc2
@smaarn
Fixed changelog
99ed826
@smaarn
Actually we're no longer shipping any binary stuff so it's an "arch l…
3a62015 
…ess" package
@smaarn
Fixed DB_TYPE scenario migration
9c6a5a8
@smaarn @hgy59
Update to apache 2.4 requirement for DSM 7
ec8c82d 
Co-authored-by: hgy59 <[email protected]>
@smaarn
Add explicit dependency on Apache 2.4 for DSM 7+ packages
fbcfc60
@smaarn
Add explicit dependency on Apache 2.4
2d6b360
@smaarn
Fix: initial install under DSM 7 should ensure the .dsm7_migrated fil…
eda4ea7 
…e should be set to prevent further upgrades from going wild
@smaarn @hgy59
Remove unnecessary shebang
fe1980c 
Co-authored-by: hgy59 <[email protected]>
@smaarn
Copy link
Contributor Author

smaarn commented Oct 2, 2022

Rebased at head before merge by EOD (CET time).

@smaarn smaarn merged commit a2447a8 into SynoCommunity:master Oct 2, 2022
@smaarn smaarn deleted the feat/tt-rss/dsm7-support branch October 8, 2022 14:07
@hgy59
Copy link
Contributor

hgy59 commented Nov 15, 2022

@smaarn is this ready to be published?
(sorry I was out for vacation from mid september to mid october)

@smaarn
Copy link
Contributor Author

smaarn commented Nov 15, 2022

@hgy59 yed it should be ready to publish. Thanks a lot !

@hgy59 hgy59 added status/published Published and activated (may take up to 48h until visible in DSM package manager) and removed status/to-publish labels Nov 15, 2022
@hgy59
Copy link
Contributor

hgy59 commented Nov 15, 2022

@smaarn to create the noarch package for SRM 1.1 I had to temporary deactivate the REQUIRED_MIN_DSM = 6.0

This was referenced Nov 15, 2022
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hgy59 hgy59 hgy59 left review comments

@ymartin59 ymartin59 ymartin59 approved these changes

Assignees
No one assigned
Labels
status/published Published and activated (may take up to 48h until visible in DSM package manager)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tt-rss don't start after install
5 participants
@smaarn @ymartin59 @ewoks @hgy59 @cc250080