Skip to content

Commit

Permalink
Merge pull request #85 from ericgaspar/patch-2
Browse files Browse the repository at this point in the history
Update bookworm
  • Loading branch information
Salamandar authored Nov 1, 2024
2 parents 23dccb6 + 6b5bac8 commit 779c1d7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions bookworm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function main()
upgrade_system || die "Failed to upgrade the system"
boring_workarounds || die "Failed to run the boring workarounds"
setup_package_source || die "Setting up deb package sources failed"
install_yunohost_packages || die "Installation of Yunohost packages failed"
install_yunohost_packages || die "Installation of YunoHost packages failed"

# For some reason sometimes dbus is not properly started/enabled ...
if [[ "$BUILD_IMAGE" == "false" ]] ; then
Expand Down Expand Up @@ -296,7 +296,7 @@ function check_assertions()

# Assert curl is setup
if ! command -v curl >/dev/null 2>&1 && ! apt_install curl; then
error "Yunohost installer requires curl to be installed, but it failed to install it."
error "YunoHost installer requires curl to be installed, but it failed to install it."
return 1
fi

Expand Down Expand Up @@ -325,11 +325,11 @@ function check_assertions()
fi
# Check possible conflict with apache, bind9.
if dpkg --get-selections | grep -v deinstall | grep -q 'bind9\s' && [[ "$FORCE" != "true" ]]; then
error "Bind9 is installed on your system. Yunohost conflicts with Bind9 because it requires dnsmasq. To be able to run this script, you should first run 'apt remove bind9 --purge --autoremove'."
error "Bind9 is installed on your system. YunoHost conflicts with Bind9 because it requires dnsmasq. To be able to run this script, you should first run 'apt remove bind9 --purge --autoremove'."
return 1
fi
if dpkg --get-selections | grep -v deinstall | grep -q 'apache2\s' && [[ "$FORCE" != "true" ]]; then
error "Apache is installed on your system. Yunohost conflicts with apache2 because it requires nginx. To be able to run this script, you should first run 'apt remove apache2 --purge --autoremove'."
error "Apache is installed on your system. YunoHost conflicts with apache2 because it requires nginx. To be able to run this script, you should first run 'apt remove apache2 --purge --autoremove'."
return 1
fi

Expand Down Expand Up @@ -504,7 +504,7 @@ function boring_workarounds() {
# Workarounds for avahi #
# ######################## #

# When attempting several installation of Yunohost on the same host
# When attempting several installation of YunoHost on the same host
# with a light VM system like LXC
# we hit a bug with avahi-daemon postinstallation
# This is described in detail in https://github.com/lxc/lxc/issues/25
Expand Down Expand Up @@ -652,21 +652,21 @@ function conclusion() {
๐ŸŽ‰ ${bold}YunoHost installation completed!$normal
โ•ญโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฎ
โ”‚ You should now proceed with Yunohost post-installation. โ”‚
โ”‚ 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 main domain of your server; โ”‚
โ”‚ โ€ข the administration password; โ”‚
โ”‚ โ€ข the name and password of the first user, which will also be admin. โ”‚
โ”‚ โ”‚
โ”‚ You can perform this step, either: โ”‚
โ”‚ โ€ข from the command line, by running 'yunohost tools postinstall' as root โ”‚
โ”‚ โ€ข or from your web browser, by accessing : โ”‚${local_ip}${global_ip}${no_ip}
โ”‚ โ€ข or from your web browser, by accessing: โ”‚${local_ip}${global_ip}${no_ip}
โ”‚ โ”‚
โ”‚ If this is your first time with YunoHost, it is strongly recommended to โ”‚
โ”‚ take time to read the administator documentation and in particular the โ”‚
โ”‚ sections 'Finalizing your setup' and 'Getting to know YunoHost'. โ”‚
โ”‚ โ”‚
โ”‚ It is available at the following URL : โžก๏ธ https://yunohost.org/admindoc โ”‚
โ”‚ It is available at the following URL: โžก๏ธ https://yunohost.org/admindoc โ”‚
โ•ฐโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฏ
Expand Down

0 comments on commit 779c1d7

Please sign in to comment.