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

Bookworm + Portal rework #1657

Draft
wants to merge 518 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
518 commits
Select commit Hold shift + click to select a range
c57a7a4
Zrgrml
alexAubin Dec 19, 2023
9a45a6c
auth/quality: replace os.path stuff with Path from pathlib
alexAubin Dec 21, 2023
20d914f
Update 'ssowat conf regenerated' message to reflect that SSO and port…
alexAubin Dec 21, 2023
d0f1d92
auth/portal/acl : add 'user is allowed for domain X' mechanism, such …
alexAubin Dec 21, 2023
746433c
Whoopsies
alexAubin Dec 21, 2023
c19e2b7
auth/portal/acl: allow admins to log on any main domain
alexAubin Dec 21, 2023
38b3cfd
quality: make linter gods happy
alexAubin Dec 21, 2023
6022be5
Prevent unecessary import resulting in catastrophies + lazy-load the …
alexAubin Dec 21, 2023
2be1dcc
mypy doesn't like the function attribute trick
alexAubin Dec 21, 2023
7e7a684
portal-api: improve handling of ldap interfaces
alexAubin Dec 22, 2023
351d936
sso: use PCRE regexes instead of LUA regex
alexAubin Dec 23, 2023
3070e50
Make rspamd an optional dependency, because rspamd is only necessary …
alexAubin Dec 26, 2023
29cac17
tests: fix hardcoded domain / typo x_x
alexAubin Dec 26, 2023
7f02fcd
portalapi/sso: add a first bunch of unit tests
alexAubin Dec 27, 2023
f505efc
password: utils/password.py is not used by ssowat anymore
alexAubin Dec 27, 2023
6655923
user/password: move to passlib hash.sha512_crypt to generate password…
alexAubin Dec 27, 2023
0856f27
Unused imports
alexAubin Dec 27, 2023
61551eb
Fix tests in CI context / yunohost-api is down and it's expected
alexAubin Dec 27, 2023
570a22a
Make linters happy
alexAubin Dec 27, 2023
7eb1413
zgrmbl
alexAubin Dec 27, 2023
0a01423
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Dec 28, 2023
3aa087c
debian/postinst: make sure /etc/yunohost/portal exists
alexAubin Jan 1, 2024
5975dd4
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jan 14, 2024
1cbc30e
So the reason the 'enable pop3' thing is not working properly is beca…
alexAubin Jan 14, 2024
0dcecf5
Remove rspamd from recommends, replace with a global setting similar …
alexAubin Jan 14, 2024
b6c55c9
SSOwat's tile overlay is no more
alexAubin Jan 14, 2024
e2aaf72
Portal theme is no more as well, now handled on a per-main-domain basis
alexAubin Jan 14, 2024
d3b50db
Unused import
alexAubin Jan 14, 2024
c9f2bb7
debian: force the dependency of resolvconf to be about the concrete p…
alexAubin Jan 14, 2024
862e66c
regenconf/dovecot: make sure the home folder for vmail user is create…
alexAubin Jan 14, 2024
388c30c
Drop a bunch of legacy stuff from the 4.x era
alexAubin Jan 14, 2024
99ac76e
Drop legacy snippet from the 3.x era
alexAubin Jan 14, 2024
d41d654
legacy: drop autopatching of PHP versions, nowadays Sury is here by d…
alexAubin Jan 14, 2024
13638b0
Oopsies
alexAubin Jan 14, 2024
94d16d6
configpanels: avoid settings being None when empty
Axolotle Jan 19, 2024
3bb5702
UrlOption: fix serialize HttpUrl to str in post validator so it can b…
Axolotle Jan 19, 2024
56b5670
domaiiconfig: add portal search engine option
Axolotle Jan 19, 2024
7f53f56
portal: add app's description + logo from catalog in portal settings
Axolotle Jan 19, 2024
0796273
sso/portal: more tests
alexAubin Jan 22, 2024
16d7f77
apps: checking that relevant services are up before app actions: the …
alexAubin Jan 22, 2024
0458692
portalapi: don't leak the full list of users nor private apps
alexAubin Jan 22, 2024
902e65f
domain: don't regen the ssowat conf when changing the main domain (cr…
alexAubin Jan 27, 2024
2d42f59
logs: remove the intermediate useless 'categories' directory, this is…
alexAubin Jan 27, 2024
6a01b65
appscatalog: this 'init' step is overengineered ... let's instead say…
alexAubin Jan 27, 2024
b33a47f
broken imports ... + more lazy loading
alexAubin Jan 27, 2024
dda095d
Cleanup legacy
alexAubin Jan 27, 2024
8bd2104
Moar lazy loading
alexAubin Jan 27, 2024
6e85323
Unused imports
alexAubin Jan 27, 2024
cc97efa
helpers: remove pre-4.2 behavior for default file/folders permissions
alexAubin Jan 30, 2024
d9daf11
helpers: fix pattern to wait for when fail2ban is starting/reloading
alexAubin Jan 30, 2024
18df4bb
ssowatconf: replace use_remote_user_var_in_nginx_conf with protect_ag…
alexAubin Jan 30, 2024
61a43df
Cleanup unused code
alexAubin Jan 30, 2024
fc048f8
tests/sso: fix redirect test, gotta explicitly tell python to not fol…
alexAubin Jan 30, 2024
80d6a6f
tests: fix/add tests for SSO
alexAubin Jan 30, 2024
c9a4838
tests/sso: add tests for subdomain and secondary 'main' domain
alexAubin Jan 31, 2024
e682fe9
apps/portalconf: use description from local manifest + cases where th…
alexAubin Jan 31, 2024
b4b55fa
Fix empty catalog test
alexAubin Jan 31, 2024
133ce6e
Fix permission test
alexAubin Jan 31, 2024
ddbd367
Fix app resource test
alexAubin Jan 31, 2024
ec8594a
Zgrombpf
alexAubin Jan 31, 2024
b427783
Make linter happy
alexAubin Jan 31, 2024
9a7ec30
configpanel: improve debugging/error message when pydantic fails to v…
alexAubin Feb 3, 2024
6a3c77e
auth: restrict cookies to the appropriate api
alexAubin Feb 3, 2024
69cc634
webadmin: add cache config for app logos
alexAubin Feb 3, 2024
ca83553
portal: serve app logos from an sso-specific route (to keep separatio…
alexAubin Feb 3, 2024
98701eb
regenconf: the 'plain' subfolder thing for nginx conf is annoying, fl…
alexAubin Feb 3, 2024
41da1da
nginx: remove old 'yunohost_panel.conf' stuff
alexAubin Feb 3, 2024
ce52910
regenconf: remove unecessary/inconsistent check that script is ran as…
alexAubin Feb 3, 2024
ceace62
regenconf: factorize nginx regenconf a bit
alexAubin Feb 3, 2024
402327d
regenconf: factorize all the dirs/perm stuff in the yunohost hook
alexAubin Feb 3, 2024
a47321e
Typo
alexAubin Feb 3, 2024
6958ea3
regenconf: more factorizing in yunohost hook
alexAubin Feb 3, 2024
8823ef0
nginx: can't really delete the old yunohost_panel.conf.inc because it…
alexAubin Feb 3, 2024
f248086
nginx: nevermind applogos caching, nowadays nginx/browsers automatica…
alexAubin Feb 3, 2024
c77d05e
portal: store custom logos in a /usr/share/yunohost/customassets, and…
alexAubin Feb 3, 2024
7f1dd86
Typo :|
alexAubin Feb 3, 2024
99e2521
Dafuq Aleks, we do need to send the SSO cookie on all route not just …
alexAubin Feb 4, 2024
76be0ee
Update 15-nginx: typo >_>
alexAubin Feb 5, 2024
11cabc0
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Mar 14, 2024
96494cb
apps: simplify env creation for config panel script, _make_environmen…
alexAubin Mar 14, 2024
7d640f8
ci: autoblack is now a github workflow
alexAubin Mar 14, 2024
2a4d5bf
helpers/configpanel: fix assumption claquée au sol that $install_dir …
alexAubin Mar 20, 2024
10c6c80
Return auth cookie valid for whole main domain.
orhtej2 Mar 26, 2024
458221e
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Apr 10, 2024
26bead7
Merge branch 'migrate-to-bookworm' into bookworm
alexAubin Apr 10, 2024
2e3b4ae
perf: add cache for system utils that fetch debian_version, debian_ve…
alexAubin Apr 10, 2024
cc39fca
Merge branch 'dev' into bookworm
alexAubin Apr 10, 2024
7a077b5
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Apr 11, 2024
3182aa8
Merge branch 'dev' into bookworm
tituspijean Apr 20, 2024
5e406a5
Allow users to access their own domain portal without app permission
selfhoster1312 May 6, 2024
2d8cd9f
Merge pull request #1822 from selfhoster1312/portal-without-apps
alexAubin May 7, 2024
582350c
mail: attempt to move to opendkim instead of rspamd for dkim signing/…
alexAubin May 7, 2024
4769242
Yolodraft: handle metronome as an app
alexAubin May 11, 2024
dc5c432
Merge pull request #1809 from orhtej2/fix_sso_domain
alexAubin May 18, 2024
42d2f78
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin May 19, 2024
c02933c
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin May 19, 2024
d4ef646
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin May 19, 2024
7674ba5
[fix] Forbidden keywords config panel
zamentur May 21, 2024
b233ce1
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin May 22, 2024
7c71bd8
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jun 4, 2024
46372a0
dns+certs: add a new cert_alternate_names hook + improve custom_dns_r…
alexAubin Jun 8, 2024
4077881
Merge remote-tracking branch 'origin/bookworm' into handle-metronome-…
alexAubin Jun 8, 2024
1e527a8
Merge pull request #1831 from YunoHost/handle-metronome-as-an-app
alexAubin Jun 9, 2024
d225992
Update certificate.py: typo @_@
alexAubin Jun 9, 2024
37c9908
Update certificate.py: moar typo @_@
alexAubin Jun 9, 2024
cff8905
Remaining metronome trick to cleanup
alexAubin Jun 9, 2024
2e59393
ldap/permissions: add a migration to delete the legacy xmpp.main perm
alexAubin Jun 9, 2024
caa26ee
tests: remove old reliances on xmpp.main
alexAubin Jun 9, 2024
bb4f9cc
Merge remote-tracking branch 'origin/migrate-to-bookworm' into bookworm
alexAubin Jun 10, 2024
e13e9bc
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jun 13, 2024
b661356
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jun 29, 2024
9cf8a7b
Test resources with influxdb instead of yarn that is installed by def…
Salamandar Jun 30, 2024
b523089
Merge pull request #1887 from YunoHost/fix_yarn_test
alexAubin Jun 30, 2024
8366e4b
Merge branch 'migrate-to-bookworm' into bookworm
alexAubin Jul 3, 2024
1a85521
Didnt realize this line could be removed during previous merge
alexAubin Jul 3, 2024
4b8506f
Add migration for postgresql 13->15 after migrating to bookworm
alexAubin Jul 3, 2024
3d05ff1
Cleanup old migrations
alexAubin Jul 3, 2024
edaffcf
Adapt venv-rebuild migration for bookworm
alexAubin Jul 3, 2024
30c512f
Fix i18n messages for bullseye->bookworm
alexAubin Jul 3, 2024
5429885
Fix i18n strings?
alexAubin Jul 3, 2024
7f7bafb
Merge branch 'migrate-to-bookworm' into bookworm
alexAubin Jul 6, 2024
6120a5a
YunoHost has a hard dependence on python 3.11 because of type hints s…
alexAubin Jul 6, 2024
c818318
Gotta depend on python3-jinja2 >= 3.0 to prevent issues with markupsaf
alexAubin Jul 6, 2024
4f7fa32
ssowatconf: change auth_header from None to false
kay0u Jul 11, 2024
3a06241
Merge pull request #1905 from YunoHost/auth_header-to-false
alexAubin Jul 11, 2024
128df3d
Update services.yml
alexAubin Jul 11, 2024
262a3c5
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 15, 2024
f16011a
Remove reference to rspamd, rspamd is to become an app
alexAubin Jul 15, 2024
5244317
Rename 0027_migrate_to_bookworm.py.disabled -> 0027_migrate_to_bookwo…
alexAubin Jul 15, 2024
6638ee3
Remove trick to force checking for migration 0027 strings
alexAubin Jul 15, 2024
daa4c39
debian: remove dependency to redis-server
alexAubin Jul 15, 2024
946d228
cleanup: we probably don't need to keep the super-legacy service entr…
alexAubin Jul 15, 2024
443eac4
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 16, 2024
03a5c3d
Ensure postgresql is upgraded to 15.
Salamandar Jul 16, 2024
91f747e
log.py: fix listing of log files
Salamandar Jul 16, 2024
9a0960d
log.py: use os.path.join instead
Salamandar Jul 16, 2024
6453d15
bullseye->bookworm: fix the /var/log/yunohost/operations folder migra…
alexAubin Jul 17, 2024
0ade9d0
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 17, 2024
609748e
mail: Make sure to restart opendkim after regenconf
alexAubin Jul 17, 2024
b9178e7
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 17, 2024
88b11be
mail: fix opendkim assuming mails arent authenticated because of miss…
alexAubin Jul 17, 2024
4211497
Update regenconf.py: cleanup legacy rspamd and metronome hash entries
alexAubin Jul 18, 2024
505e3db
ci: fallback to bookworm branch for build such that even on PR on top…
alexAubin Jul 22, 2024
03def5b
appconfig panel: new values were replaced by default values
kay0u Jul 23, 2024
a069cda
fix permission test
kay0u Jul 23, 2024
f547ac2
Merge pull request #1919 from YunoHost/fix-appconfig-panel
alexAubin Jul 23, 2024
970e2e2
services: redis ain't installed by default anymore on yunohost
alexAubin Jul 25, 2024
d0ce8cc
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 25, 2024
9a6ad19
apps/ssowat: fix default value for auth_header and protect_against_ba…
alexAubin Jul 26, 2024
ccfea31
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 26, 2024
a1e63a1
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 26, 2024
6f1e341
Update changelog for 12.0.1
alexAubin Jul 26, 2024
7b50c4e
remove redis regen conf too
kay0u Jul 30, 2024
eb1d715
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Jul 30, 2024
0503a38
bullseye->bookworm: add a trick to flag the migration as done if it's…
alexAubin Jul 30, 2024
7a45675
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Aug 1, 2024
54fd311
Update changelog for 12.0.2
alexAubin Aug 1, 2024
656e5c7
ci: Fix test_permission_propagation_on_ssowat ?
alexAubin Aug 5, 2024
bc93a2e
portalapi: we don't need absolute URLs for app logos ? (This ain't wo…
alexAubin Aug 5, 2024
cdf443c
portalapi: fix portal_user_intro not being sent when authenticated, h…
alexAubin Aug 5, 2024
24fb877
portail/domain settings: Improve explanation about search engine
alexAubin Aug 5, 2024
279f332
domain settings: add a title to the Email section to have a separatio…
alexAubin Aug 5, 2024
9e93130
ci: fix auth header test?
alexAubin Aug 5, 2024
44920d8
ci: fix test_sso_basic_auth_header now that the default is with-passw…
alexAubin Aug 5, 2024
fe9a4fb
ci: new image names, now using 'shared' image build process with the …
alexAubin Aug 7, 2024
0598182
ci: Merp, explicitly use python3
alexAubin Aug 7, 2024
14ee49f
ci: really aleks
alexAubin Aug 7, 2024
a9e71e8
ci: fix missing image name for i18n job
alexAubin Aug 8, 2024
7f2da0a
ci: tweaks to try to run build/lints into a 'permanent' container (no…
alexAubin Aug 8, 2024
94594e5
ci: try skipping diagnosis during upgrade to speed things up a bit?
alexAubin Aug 8, 2024
d639e1c
ci: ignore boring warning 'Could not identify correctly the dns zone …
alexAubin Aug 8, 2024
cb6778c
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Aug 8, 2024
66049a2
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Aug 8, 2024
69b9055
ci: also get rid of those old temporary nginx restart for debug
alexAubin Aug 8, 2024
3318159
ci: hmmm temporarily(?) enable debug during postinstall to investigat…
alexAubin Aug 13, 2024
4f3b9df
ci: try to generate partial coverage data arterfact during tests, whi…
alexAubin Aug 13, 2024
98731ba
ci: merp?
alexAubin Aug 13, 2024
5a6a915
ci: force coverage file to have a different name per job ?
alexAubin Aug 13, 2024
55e7e79
ci: yoloattempt to combine the coverage reports
alexAubin Aug 13, 2024
87c30dd
ci: fix indent?
alexAubin Aug 13, 2024
2fe2442
ci: try to fix coverage remembering absolute path instead of relative…
alexAubin Aug 13, 2024
4fc9290
ci: speedup git clone for test_apps using --depth 1
alexAubin Aug 14, 2024
fd040b8
ci: drop unused option --yunodebug in pytest conftest
alexAubin Aug 14, 2024
0bbc14f
ci: when running pytest, make sure that 'import yunohost' will load t…
alexAubin Aug 14, 2024
ace7dd1
ci: remove tmp --debug, issue was due to hideproc failing to enable b…
alexAubin Aug 14, 2024
2976e7b
ci: moar fixes to get the pytest import right ? x_x
alexAubin Aug 14, 2024
4ee8d4e
ci: fix mypy complains
alexAubin Aug 14, 2024
1ba75df
quality: add type hints to user.py
alexAubin Aug 14, 2024
4a03cdc
quality: unused import é_è
alexAubin Aug 14, 2024
d4f39da
quality: zblerg type must exist in runtime too, but using the classna…
alexAubin Aug 15, 2024
611846a
quality: similar to previous commit...
alexAubin Aug 15, 2024
efce7f9
Fix weird typing issue breaking runtime ~_~
alexAubin Aug 15, 2024
fe1c04f
quality: fix type confusion + mypy not actually checking the function…
alexAubin Aug 15, 2024
2ef5b24
tests: moar friskies
alexAubin Aug 15, 2024
603c64e
portal: fix extra app tiles not being displayed, gotta use the perm i…
alexAubin Aug 17, 2024
a6b7ba8
portal/sso: with the public app page, fix the root of the domain not …
alexAubin Aug 17, 2024
8f63656
portal: allow to configure custom CSS from the domain config panel
alexAubin Aug 18, 2024
748a20d
portal: change the way the new 'public apps' page in the portal is co…
alexAubin Aug 18, 2024
8311314
portal: add proper i18n string + help for new settings
alexAubin Aug 18, 2024
560dac1
domain: reorder config panel sections
alexAubin Aug 18, 2024
9973cc7
Update config_domain.toml: propagate change in theme list from yunoho…
alexAubin Aug 20, 2024
ff03885
i18n: add i18n for domain and global config panel and sections
alexAubin Aug 20, 2024
16e8205
quality/typing: missing type import
alexAubin Aug 20, 2024
f37bfca
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Aug 27, 2024
70a5bbc
zblerg
alexAubin Aug 27, 2024
36ffa13
merp
alexAubin Aug 27, 2024
2cc1e72
apps/config panel: fix _compute_binds + _dump_options_types_and_binds…
alexAubin Aug 28, 2024
72a13c7
ja ja typing stuff gneugneugneu
alexAubin Aug 28, 2024
317a7f9
resources: Workaround for duplicate yarn repository
Aug 30, 2024
dd1853e
Merge pull request #1888 from YunoHost/fix_repo_extra_yarn
alexAubin Aug 30, 2024
d6167c5
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Aug 31, 2024
0496cad
Update changelog for 12.0.3
alexAubin Aug 31, 2024
daefc56
Add yunohost-portal to the --version output
kay0u Sep 1, 2024
5edb8bd
Merge pull request #1946 from YunoHost/add-portal-version
alexAubin Sep 1, 2024
2577fb1
certificate: check if domain dns records as a wildcard
Axolotle Sep 9, 2024
8d1fd9c
domain: add `install_letsencrypt_cert` option to domain_add
Axolotle Sep 9, 2024
012cd49
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Sep 9, 2024
d5d6fb8
fix(domain): `custom_css` may not be in the the form when changing ot…
Axolotle Sep 10, 2024
4507361
postinstall: add CLI TOS acknowledgement
Axolotle Sep 11, 2024
ed67d14
domain: add CLI TOS acknowledgement for dyndns domain addition
Axolotle Sep 11, 2024
78d0ab7
i18n: add TOS related translation keys
Axolotle Sep 11, 2024
96a6b1f
tos: wording
alexAubin Sep 12, 2024
3746226
tos: add a skip_tos for domain_add to solve the fact that the ToS que…
alexAubin Sep 12, 2024
8c1813f
tos: add migration to advertise the ToS for existing installs
alexAubin Sep 12, 2024
521fb65
Unused import @_@
alexAubin Sep 12, 2024
fada3ce
certificate: check topest parent domain has dns wildcard
Axolotle Sep 13, 2024
f578c9f
domain_add: first install selfsigned cert before trying to install le…
Axolotle Sep 13, 2024
ad690b9
cert_status: allow API to get all domains cert status with `*`
Axolotle Sep 13, 2024
eb11214
lint: fix
Axolotle Sep 13, 2024
6c0a5b9
configpanels: pass config object to `_apply`
Axolotle Sep 15, 2024
0c8fef1
configpanels: add `get_panel` and `get_section` method to `ConfigPane…
Axolotle Sep 15, 2024
de49711
dns: fix special-use tld registrar infos
Axolotle Sep 15, 2024
f101118
dns: raise validation error on `domain_dns_push` for special-use tld
Axolotle Sep 15, 2024
9afb454
domain: make dns registrar auth infos optional + add `use_auto_dns` b…
Axolotle Sep 15, 2024
bdffa19
domain: Also remove `managed_dns_records_hashes` in settings which ar…
Axolotle Sep 15, 2024
e6324e3
fix: missing config param in settings ConfigPanel._apply
Axolotle Sep 15, 2024
f19b6f8
configpanels: fix boolean option in context evaluation for custom yes…
Axolotle Sep 15, 2024
d2481c8
Merge pull request #1949 from YunoHost/enh-tos
alexAubin Sep 16, 2024
59b7cd6
Update src/domain.py
alexAubin Sep 16, 2024
c05bdbc
Merge pull request #1951 from YunoHost/enh-auto-dns
alexAubin Sep 16, 2024
0b5d886
Update src/domain.py
alexAubin Sep 16, 2024
1fad0e9
Merge branch 'bookworm' into enh-domain-add-subdomain
alexAubin Sep 16, 2024
dfb9321
Merge pull request #1936 from YunoHost/enh-domain-add-subdomain
alexAubin Sep 16, 2024
1755dd6
Merge remote-tracking branch 'origin/dev' into bookworm
alexAubin Sep 16, 2024
a332400
Update changelog for 12.0.4
alexAubin Sep 16, 2024
9d49f9b
fix: allow secondaries instances of apps_that_need_external_auth_mayb…
nathanael-h Sep 18, 2024
3c302fb
Merge pull request #1954 from nathanael-h/bookworm
alexAubin Sep 18, 2024
cebd886
domain_add: fix missing translation param
Axolotle Sep 20, 2024
0e99a0b
Update changelog for 12.0.4.1
alexAubin Sep 25, 2024
d0005e6
fix: backup and restore portal settings
Tagadda Sep 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
[coverage:run]
relative_files = True
source = src/
branch = True

[report]
omit=src/tests/*,src/vendor/*,/usr/lib/moulinette/yunohost/*,/usr/lib/python3/dist-packages/yunohost/tests/*,/usr/lib/python3/dist-packages/yunohost/vendor/*
7 changes: 3 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
stages:
- lint
- build
- install
- test
- lint
- doc
- translation
- bot

default:
tags:
Expand Down Expand Up @@ -47,7 +46,7 @@ workflow:
variables:
GIT_CLONE_PATH: '$CI_BUILDS_DIR/$CI_COMMIT_SHA/$CI_JOB_ID'
YNH_SOURCE: "https://github.com/yunohost"
YNH_DEBIAN: "bullseye"
YNH_DEBIAN: "bookworm"
YNH_SKIP_DIAGNOSIS_DURING_UPGRADE: "true"

include:
Expand Down
53 changes: 53 additions & 0 deletions .gitlab/ci/bot.gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
generate-helpers-doc:
stage: bot
image: "build-and-lint"
needs: []
before_script:
- git config --global user.email "[email protected]"
- git config --global user.name "$GITHUB_USER"
script:
- cd doc
- python3 generate_helper_doc.py 2
- python3 generate_helper_doc.py 2.1
- python3 generate_resource_doc.py > resources.md
- python3 generate_configpanel_and_formoptions_doc.py > forms.md
- hub clone https://$GITHUB_TOKEN:[email protected]/YunoHost/doc.git doc_repo
- cp helpers.v2.md doc_repo/pages/06.contribute/10.packaging_apps/20.scripts/10.helpers/packaging_app_scripts_helpers.md
- cp helpers.v2.1.md doc_repo/pages/06.contribute/10.packaging_apps/20.scripts/12.helpers21/packaging_app_scripts_helpers_v21.md
- cp resources.md doc_repo/pages/06.contribute/10.packaging_apps/10.manifest/10.appresources/packaging_app_manifest_resources.md
- cp forms doc_repo/pages/06.contribute/15.dev/03.forms/forms.md
- cd doc_repo
# replace ${CI_COMMIT_REF_NAME} with ${CI_COMMIT_TAG} ?
- hub checkout -b "${CI_COMMIT_REF_NAME}"
- hub commit -am "[CI] Update app helpers/resources for ${CI_COMMIT_REF_NAME}"
- hub pull-request -m "[CI] Update app helpers/resources for ${CI_COMMIT_REF_NAME}" -p # GITHUB_USER and GITHUB_TOKEN registered here https://gitlab.com/yunohost/yunohost/-/settings/ci_cd
artifacts:
paths:
- doc/helpers.md
- doc/resources.md
only:
- tags

autofix-translated-strings:
stage: bot
image: "build-and-lint"
needs: []
before_script:
- git config --global user.email "[email protected]"
- git config --global user.name "$GITHUB_USER"
- hub clone --branch ${CI_COMMIT_REF_NAME} "https://$GITHUB_TOKEN:[email protected]/YunoHost/yunohost.git" github_repo
- cd github_repo
script:
# create a local branch that will overwrite distant one
- git checkout -b "ci-autofix-translated-strings-${CI_COMMIT_REF_NAME}" --no-track
- python3 maintenance/missing_i18n_keys.py --fix
- python3 maintenance/autofix_locale_format.py
- '[ $(git diff --ignore-blank-lines --ignore-all-space --ignore-space-at-eol --ignore-cr-at-eol | wc -l) != 0 ] || exit 0' # stop if there is nothing to commit
- git commit -am "[CI] Reformat / remove stale translated strings" || true
- git push -f origin "ci-autofix-translated-strings-${CI_COMMIT_REF_NAME}":"ci-remove-stale-translated-strings-${CI_COMMIT_REF_NAME}"
- hub pull-request -m "[CI] Reformat / remove stale translated strings" -b Yunohost:$CI_COMMIT_REF_NAME -p || true # GITHUB_USER and GITHUB_TOKEN registered here https://gitlab.com/yunohost/yunohost/-/settings/ci_cd
only:
variables:
- $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
changes:
- locales/*
11 changes: 8 additions & 3 deletions .gitlab/ci/build.gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
.build-stage:
stage: build
needs:
- job: actionsmap
- job: invalidcode311
image: "build-and-lint"
variables:
YNH_BUILD_DIR: "$GIT_CLONE_PATH/build"
before_script:
- echo $PWD
- echo $CI_PROJECT_DIR
- mkdir -p $YNH_BUILD_DIR
artifacts:
paths:
Expand Down Expand Up @@ -31,7 +36,7 @@ build-yunohost:
- mkdir -p $YNH_BUILD_DIR/$PACKAGE
- cat archive.tar.gz | tar -xz -C $YNH_BUILD_DIR/$PACKAGE
- rm archive.tar.gz
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE || { apt-get update && DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE; }
- *build_script

build-ssowat:
Expand All @@ -40,7 +45,7 @@ build-ssowat:
PACKAGE: "ssowat"
script:
- git clone $YNH_SOURCE/$PACKAGE -b $CI_COMMIT_REF_NAME $YNH_BUILD_DIR/$PACKAGE --depth 1 || git clone $YNH_SOURCE/$PACKAGE -b $YNH_DEBIAN $YNH_BUILD_DIR/$PACKAGE --depth 1 || git clone $YNH_SOURCE/$PACKAGE $YNH_BUILD_DIR/$PACKAGE --depth 1
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE || { apt-get update && DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE; }
- *build_script

build-moulinette:
Expand All @@ -49,5 +54,5 @@ build-moulinette:
PACKAGE: "moulinette"
script:
- git clone $YNH_SOURCE/$PACKAGE -b $CI_COMMIT_REF_NAME $YNH_BUILD_DIR/$PACKAGE --depth 1 || git clone $YNH_SOURCE/$PACKAGE -b $YNH_DEBIAN $YNH_BUILD_DIR/$PACKAGE --depth 1 || git clone $YNH_SOURCE/$PACKAGE $YNH_BUILD_DIR/$PACKAGE --depth 1
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE
- DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE || { apt-get update && DEBIAN_FRONTEND=noninteractive apt --assume-yes -o Dpkg::Options::="--force-confold" build-dep $YNH_BUILD_DIR/$PACKAGE; }
- *build_script
31 changes: 0 additions & 31 deletions .gitlab/ci/doc.gitlab-ci.yml

This file was deleted.

25 changes: 20 additions & 5 deletions .gitlab/ci/lint.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,39 @@
########################################
# later we must fix lint and format-check jobs and remove "allow_failure"

lint39:
actionsmap:
stage: lint
image: "build-and-lint"
needs: []
script:
- python3 -c 'import yaml; yaml.safe_load(open("share/actionsmap.yml"))'
- python3 -c 'import yaml; yaml.safe_load(open("share/actionsmap-portal.yml"))'

lint311:
stage: lint
image: "build-and-lint"
needs: []
allow_failure: true
script:
- tox -e py39-lint
- tox -e py311-lint

invalidcode39:
invalidcode311:
stage: lint
image: "build-and-lint"
needs: []
script:
- tox -e py39-invalidcode
- tox -e py311-invalidcode

mypy:
stage: lint
image: "build-and-lint"
needs: []
script:
- tox -e py39-mypy
- tox -e py311-mypy

i18n-keys:
stage: lint
image: "build-and-lint"
needs: []
script:
- python3 maintenance/missing_i18n_keys.py --check
Loading
Loading