server.toml should always be at the beginning of config.toml

[OniriCorpe]

Problem

• in some cases, server.toml is not put at the beginning of the generated config.toml, which puts the server in error

Solution

• ensuring that server.toml is at the beginning of the generated config.toml

PR Status

• [x] Code finished and ready to be reviewed/tested
• [x] The fix/enhancement were manually tested (if applicable)

[yunohost-bot]

[Bullseye :horse:] Alrighty!

[yunohost-bot]

Alrighty!

[yalh76]

Shouldn't we remove or rename /etc/$app/config.d/server.toml during upgrade ? Or it will be integrated in config.toml two times ?

[OniriCorpe]

ah good point! it's done

[yalh76]

ah good point! it's done

I think we could try something more future proof, for example: checking if /etc/$app/config.d/server.toml.head exist if not

• renaming /etc/$app/config.d/server.toml to /etc/$app/config.d/server.toml.head
• deleting checksum for /etc/$app/config.d/server.toml
• creating the checksum for /etc/$app/config.d/server.toml.head

PS: ynh_add_config do a ynh_store_file_checksum

[OniriCorpe]

Except for deleting checksum for /etc/$app/config.d/server.toml I'm not sure it's really pertinent but as you want :)

(for renaming the file is finally replaced so it's equivalent, and for creating the checksum the new ynh_add_config makes this already for the new file)

[OniriCorpe]

I have done what is necessary to remove the checksum and improve the deletion of the server.toml file (which fixes the error for [Test 4/7] Upgrade from the same version) If you want us to do the rest too, don't hesitate

[yunohost-bot]

:rocket:

[yalh76]

!testme

[yunohost-bot]

:v: