syncthing: update to v1.23.4 and include next-gen-gui #5523

hgy59 · 2022-12-16T11:54:04Z

Description

regarding Syncthing: accept: function not implemented #5289 we have to wait for GO v1.19.5 to include fix for ARMv5
update syncthing to v1.22.2
include next-get-gui and provide it under /tech-ui
fix parameter of ca_reloader.sh
fix link in wizard files

Checklist

Build rule all-supported completed successfully
New installation of package completed successfully
Package upgrade completed successfully (Manually install the package again)
Package functionality was tested
Any needed documentation is updated/created

Type of change

hgy59 · 2022-12-16T13:05:02Z

@acolomb I plan to add configuration of a shared folder to the installation wizard. This folder will be used as the default sync folder.

Currently the package var folder is used as HOME and therefore the default sync folder (for sc-syncthing service user). As reported in #3320 this folder is not accessible by DSM users. A shared folder will be supported by DSM to configure dedicated user permissions.

I already updated syncthing in this PR to not create the default folder at first service start.

Any hint is appreciated, as I am not a syncthing user.

acolomb · 2022-12-16T20:04:07Z

Well, Syncthing doesn't have or need the concept of one main folder, as it can be pointed at any accessible path in the file system. The default folder is basically just to help get people jump-started on the Desktop. It doesn't really make sense on a NAS I think, where the purpose is usually to synchronize files which are also used by other applications or sharing protocols.

Thus the most sensible solution would be to just disable creating the default folder, via --no-default-folder when first calling syncthing generate or syncthing serve in service-setup.sh.

If you want to add a "share" through the wizard, where would that be stored and how could other apps access it? I don't see how creating an empty default folder under a new share really helps with using Syncthing on the NAS. The default folder can be removed from Syncthing anytime, but the share will stay around, for what purpose?

cross/syncthing/Makefile

spk/syncthing/Makefile

spk/syncthing/src/ca_reloader.sh

spk/syncthing/src/options.conf

cross/syncthing/PLIST

hgy59 · 2022-12-17T14:45:09Z

@acolomb I am not happy with the creation of a shared folder.
What about my solution to define a custom HOME folder in options.conf?

acolomb

I like how the HOME variable can be overridden now, but I seriously doubt anyone will use it. The template folder path can already be adjusted directly in the Web GUI, and therefore $HOME is only relevant for the meaning of ~.

I haven't tested any of this yet, just looked at the code.

spk/syncthing/src/ca_reloader.sh

spk/syncthing/src/service-setup.sh

acolomb · 2023-01-11T13:10:44Z

@hgy59 This should be updated to the latest Syncthing v1.23.0 (or whatever is the latest stable) release before merging.

acolomb · 2023-01-11T21:59:55Z

@hgy59 I've now successfully built the package for aarch64, including the next-gen-gui, with Go 1.19.5. It took about four minutes mainly because of all the NPM stuff going on. Frankly I don't even know what even needs "building" there, the usual GUI just works from the Git repo state.

So I repeat my request to please leave this --with-next-gen-gui part out of the build and drop the NPM dependency.

If anyone wants to use the "tech-ui", it's as simple as unzipping its build to the theme folder (we can keep the introduced gui/ subdirectory), but the build doesn't need to happen during SPK construction IMHO. This leaves room for other drop-in themes or modified GUIs. Actually someone is currently working on modernizing the old Web GUI, so we'll see whether that ends up needing a build step, but right now please skip it for the tech-ui.

- update syncthing to v1.22.2 - include next-get-gui and provide it under /tech-ui - fix parameter of ca_reloader.sh - fix link in wizard files

- avoid the creation of a default folder on first startup

…irst start of syncthing

Co-authored-by: André Colomb <github.com@andre.colomb.de>

- avoid the use of '--home' argument as not related to HOME env. variable - enable to define custom HOME folder in options.conf

- add customization information to wizard - fix install_uifile_fre (add wizard_username and wizard_password) - add information for options.conf.new to upgrade wizard

Co-authored-by: André Colomb <github.com@andre.colomb.de>

- omit to compile synchthing --with-next-gen-gui

hgy59 · 2023-02-12T14:09:19Z

@acolomb this should be ready to merge now

acolomb · 2023-02-12T14:28:52Z

Let me take a look tonight or tomorrow probably.

hgy59 · 2023-02-12T15:10:48Z

Let me take a look tonight or tomorrow probably.

don't hurry, I will be offline for about a week. (BTW i removed the nodejs dependency by adding prebuilt tech-ui).

hgy59 · 2023-02-25T17:36:34Z

@acolomb just a friendly reminder to have a look at this PR.

acolomb · 2023-02-27T18:49:58Z

Thanks @hgy59 and sorry for taking so long. I've had some unforeseen things to take care of lately so didn't get a chance to look at code. Hopefully this week.

agoeckner · 2023-04-05T04:58:28Z

If the "next gen UI" is a sticking point, can we please just perform an upgrade to v1.23.1 and relegate the UI to another PR?

acolomb · 2023-04-05T07:23:21Z

I just didn't find the time to review again, but it's not forgotten and I will try to get it done very soon.

Before we merge, v1.23.3 just came out, so better include that latest version before merging. However a bug (syncthing/syncthing#8851) was just found which may lead to another point release in the next few days, will keep you posted on that.

Note that you should be on Syncthing v1.23.3 already if you haven't disabled the internal upgrade mechanism. The packaged binary keeps itself up to date regardless of the SPK package version.

agoeckner · 2023-04-06T02:22:41Z

Note that you should be on Syncthing v1.23.3 already if you haven't disabled the internal upgrade mechanism. The packaged binary keeps itself up to date regardless of the SPK package version.

Thanks! I forgot that I had disabled the updater. All is working well now with v1.23.4 on my DS212j.

acolomb

Looks good except for needing an upgrade to v1.23.4 now. Suggestions included to carry that out. Otherwise just a simple needless whitespace change.

cross/syncthing/Makefile

spk/syncthing/Makefile

cross/syncthing/Makefile

cross/syncthing/digests

spk/syncthing/Makefile

Co-authored-by: André Colomb <github.com@andre.colomb.de>

- avoid running ca_reloader.sh on DSM 7+

acolomb suggested changes Dec 16, 2022

View reviewed changes

acolomb reviewed Dec 17, 2022

View reviewed changes

spk/syncthing/src/ca_reloader.sh Show resolved Hide resolved

spk/syncthing/src/service-setup.sh Outdated Show resolved Hide resolved

hgy59 mentioned this pull request Jan 6, 2023

go: update to 1.19.5 (security update) #5551

Merged

10 tasks

hgy59 force-pushed the update_syncthing branch from f6c693d to d341c68 Compare January 10, 2023 22:29

hgy59 force-pushed the update_syncthing branch from 3241f18 to 808dc7a Compare February 11, 2023 16:09

hgy59 and others added 13 commits February 12, 2023 14:35

syncthing: update to v1.22.2 and include next-gen-gui

109e7f1

- update syncthing to v1.22.2 - include next-get-gui and provide it under /tech-ui - fix parameter of ca_reloader.sh - fix link in wizard files

syncthing SynoCommunity#3320

a9d6c17

- avoid the creation of a default folder on first startup

fix usage text in ca_reloader.sh

15c8b02

clarify that the parameter --no-default-folder is ignored after the f…

7ecb795

…irst start of syncthing

Update spk/syncthing/Makefile

289b155

Co-authored-by: André Colomb <github.com@andre.colomb.de>

Update cross/syncthing/PLIST

9873994

Co-authored-by: André Colomb <github.com@andre.colomb.de>

avoid to use $HOME as default sync folder

4abfa1b

update syncthing configuration

839efee

- avoid the use of '--home' argument as not related to HOME env. variable - enable to define custom HOME folder in options.conf

create options.conf.new on package update for DSM<7

df84b63

update wizard pages

8c5129c

- add customization information to wizard - fix install_uifile_fre (add wizard_username and wizard_password) - add information for options.conf.new to upgrade wizard

Update spk/syncthing/src/service-setup.sh

ceeeb77

Co-authored-by: André Colomb <github.com@andre.colomb.de>

move tech-ui to dedicated module and download prebuilt release

b55331a

- omit to compile synchthing --with-next-gen-gui

syncthing: udpate to v1.23.1

9c9c0dc

hgy59 force-pushed the update_syncthing branch from 808dc7a to 9c9c0dc Compare February 12, 2023 13:39

hgy59 changed the title ~~syncthing: update to v1.22.2 and include next-gen-gui~~ syncthing: update to v1.23.1 and include next-gen-gui Feb 12, 2023

acolomb suggested changes Apr 26, 2023

View reviewed changes

hgy59 and others added 5 commits April 26, 2023 22:58

Update spk/syncthing/Makefile

4db0f93

Co-authored-by: André Colomb <github.com@andre.colomb.de>

Update cross/syncthing/digests

9aec175

Co-authored-by: André Colomb <github.com@andre.colomb.de>

Update spk/syncthing/Makefile

d0b4a72

Co-authored-by: André Colomb <github.com@andre.colomb.de>

Update cross/syncthing/Makefile

4bf23f1

Co-authored-by: André Colomb <github.com@andre.colomb.de>

final cleanup

526df96

- avoid running ca_reloader.sh on DSM 7+

hgy59 changed the title ~~syncthing: update to v1.23.1 and include next-gen-gui~~ syncthing: update to v1.23.4 and include next-gen-gui Apr 26, 2023

hgy59 merged commit 19ec801 into SynoCommunity:master Apr 26, 2023

hgy59 deleted the update_syncthing branch April 26, 2023 21:28

hgy59 added the status/published Published and activated (may take up to 48h until visible in DSM package manager) label Apr 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

syncthing: update to v1.23.4 and include next-gen-gui #5523

syncthing: update to v1.23.4 and include next-gen-gui #5523

hgy59 commented Dec 16, 2022 •

edited

Loading

hgy59 commented Dec 16, 2022

acolomb commented Dec 16, 2022

hgy59 commented Dec 17, 2022 •

edited

Loading

acolomb left a comment

acolomb commented Jan 11, 2023

acolomb commented Jan 11, 2023

hgy59 commented Feb 12, 2023

acolomb commented Feb 12, 2023

hgy59 commented Feb 12, 2023

hgy59 commented Feb 25, 2023

acolomb commented Feb 27, 2023

agoeckner commented Apr 5, 2023 •

edited

Loading

acolomb commented Apr 5, 2023

agoeckner commented Apr 6, 2023

acolomb left a comment

syncthing: update to v1.23.4 and include next-gen-gui #5523

syncthing: update to v1.23.4 and include next-gen-gui #5523

Conversation

hgy59 commented Dec 16, 2022 • edited Loading

Description

Checklist

Type of change

hgy59 commented Dec 16, 2022

acolomb commented Dec 16, 2022

hgy59 commented Dec 17, 2022 • edited Loading

acolomb left a comment

Choose a reason for hiding this comment

acolomb commented Jan 11, 2023

acolomb commented Jan 11, 2023

hgy59 commented Feb 12, 2023

acolomb commented Feb 12, 2023

hgy59 commented Feb 12, 2023

hgy59 commented Feb 25, 2023

acolomb commented Feb 27, 2023

agoeckner commented Apr 5, 2023 • edited Loading

acolomb commented Apr 5, 2023

agoeckner commented Apr 6, 2023

acolomb left a comment

Choose a reason for hiding this comment

hgy59 commented Dec 16, 2022 •

edited

Loading

hgy59 commented Dec 17, 2022 •

edited

Loading

agoeckner commented Apr 5, 2023 •

edited

Loading