From fe524dd866a1852b415cde7a10c366dfd754f19f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 31 Jul 2024 15:48:06 +0200 Subject: [PATCH 1/3] Fix yunomprompt not being enable after ISO install --- bin/yunoprompt | 2 +- hooks/conf_regen/01-yunohost | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/yunoprompt b/bin/yunoprompt index 3ab510d2a..fdc51d9bd 100755 --- a/bin/yunoprompt +++ b/bin/yunoprompt @@ -69,7 +69,7 @@ then You should now proceed with YunoHost post-installation. This is where you will be asked for: - the main domain of your server; - - the administration password. + - the username and password for the first admin You can perform this step: - from your web browser, by accessing: https://yunohost.local/ or ${local_ip} diff --git a/hooks/conf_regen/01-yunohost b/hooks/conf_regen/01-yunohost index 3d7bfa023..ac92d5300 100755 --- a/hooks/conf_regen/01-yunohost +++ b/hooks/conf_regen/01-yunohost @@ -64,6 +64,10 @@ do_init_regen() { systemctl enable yunohost-api.service --quiet systemctl start yunohost-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 cp dpkg-origins /etc/dpkg/origins/yunohost From e88ba3428c47a6fbd99b371cf18bf8ab5c91d165 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 1 Aug 2024 18:04:53 +0200 Subject: [PATCH 2/3] Minor cosmetic / prevent double slashes --- hooks/conf_regen/02-ssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/conf_regen/02-ssl b/hooks/conf_regen/02-ssl index 1aaab59d1..10ef7d83c 100755 --- a/hooks/conf_regen/02-ssl +++ b/hooks/conf_regen/02-ssl @@ -3,7 +3,7 @@ set -e 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_crt="/etc/yunohost/certs/yunohost.org/crt.pem" ynh_key="/etc/yunohost/certs/yunohost.org/key.pem" From 9f6f5f92fba75aea01300a57d9c83b1ffb673a84 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 1 Aug 2024 18:06:23 +0200 Subject: [PATCH 3/3] Update changelog for 11.2.26 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1eb7edf34..126361bfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 Thu, 01 Aug 2024 18:05:33 +0200 + yunohost (11.2.25) stable; urgency=low - diagnosis: be more robust when diagnosis DMARC records not containing '=' (d376677db)