Merge remote-tracking branch 'origin/dev' into bookworm

This commit is contained in:
Alexandre Aubin 2024-08-01 18:08:06 +02:00
commit 7a45675f7a
4 changed files with 15 additions and 3 deletions

View file

@ -69,7 +69,7 @@ then
You should now proceed with YunoHost post-installation. This is where you will You should now proceed with YunoHost post-installation. This is where you will
be asked for: be asked for:
- the main domain of your server; - the main domain of your server;
- the administration password. - the username and password for the first admin
You can perform this step: You can perform this step:
- from your web browser, by accessing: https://yunohost.local/ or ${local_ip} - from your web browser, by accessing: https://yunohost.local/ or ${local_ip}

9
debian/changelog vendored
View file

@ -27,6 +27,15 @@ yunohost (12.0.0) unstable; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 04 May 2023 20:30:19 +0200 -- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 04 May 2023 20:30:19 +0200
yunohost (11.2.26) stable; urgency=low
- bullseye->bookworm: encourage apt to remove luajit if it's installed because for some reason it's causing issues (423e79bd5)
- bullseye->bookworm: have a specific step dedicated to upgrade python3.9 to 3.11 because apt(itude) is derping about it sometimes... (d766f7cdd)
- bullseye->bookworm: boring tweak to remove chattr +i from /etc/resolv.conf otherwise resolvconf will later explode and complain about it (65ea34d7c)
- Fix yunomprompt not being enable after ISO install (fe524dd86)
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 01 Aug 2024 18:05:33 +0200
yunohost (11.2.25) stable; urgency=low yunohost (11.2.25) stable; urgency=low
- diagnosis: be more robust when diagnosis DMARC records not containing '=' (d376677db) - diagnosis: be more robust when diagnosis DMARC records not containing '=' (d376677db)

View file

@ -187,9 +187,12 @@ do_init_regen() {
systemctl enable yunohost-api.service --quiet systemctl enable yunohost-api.service --quiet
systemctl start yunohost-api.service systemctl start yunohost-api.service
systemctl enable yunohost-portal-api.service systemctl enable yunohost-portal-api.service --quiet
systemctl start yunohost-portal-api.service systemctl start yunohost-portal-api.service
# Enable yunoprompt (in particular for installs from ISO where we want this to show on first boot instead of asking for a login/password)
systemctl enable yunoprompt --quiet
# Yunohost-firewall is enabled only during postinstall, not init, not 100% sure why # Yunohost-firewall is enabled only during postinstall, not init, not 100% sure why
cp dpkg-origins /etc/dpkg/origins/yunohost cp dpkg-origins /etc/dpkg/origins/yunohost

View file

@ -3,7 +3,7 @@
set -e set -e
ssl_dir="/usr/share/yunohost/ssl" ssl_dir="/usr/share/yunohost/ssl"
template_dir="/usr/share/yunohost/conf/ssl/" template_dir="/usr/share/yunohost/conf/ssl"
ynh_ca="/etc/yunohost/certs/yunohost.org/ca.pem" ynh_ca="/etc/yunohost/certs/yunohost.org/ca.pem"
ynh_crt="/etc/yunohost/certs/yunohost.org/crt.pem" ynh_crt="/etc/yunohost/certs/yunohost.org/crt.pem"
ynh_key="/etc/yunohost/certs/yunohost.org/key.pem" ynh_key="/etc/yunohost/certs/yunohost.org/key.pem"