From c0b29db0628993e0759fb8aad00c6655e6dbd231 Mon Sep 17 00:00:00 2001
From: Austin Bohannon <github@alphahotelbravo.io>
Date: Thu, 2 Jan 2020 14:25:58 +0100
Subject: [PATCH] Clarify when Certbot is installed
Closes #3
---
install.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/install.sh b/install.sh
index 03b3b65..9e974e6 100644
--- a/install.sh
+++ b/install.sh
@@ -71,14 +71,14 @@ setup() {
read -p "Enter the username for the admin account (leave empty to skip account creation) " funkwhale_admin_username
fi
if [ -z "$funkwhale_admin_email" ]; then
- read -p "Enter the email used for the admin user and Let's Encrypt certificate: " funkwhale_admin_email
+ read -p "Enter the email used for the admin user (and Let's Encrypt certificate): " funkwhale_admin_email
fi
if [ -z "$customize_install" ]; then
- yesno_prompt customize_install "The complete installation will setup Nginx, PostgresQL and Redis. Do you want customize what is installed?" "no"
+ yesno_prompt customize_install "The complete installation will setup Nginx, Certbot, PostgresQL and Redis. Do you want customize what is installed?" "no"
fi
if [ "$customize_install" = "true" ]; then
- yesno_prompt funkwhale_nginx_managed 'Install and manage Nginx?' 'yes'
+ yesno_prompt funkwhale_nginx_managed 'Install and manage Nginx and Certbot?' 'yes'
yesno_prompt funkwhale_database_managed 'Install and manage PostgreSQL?' 'yes'
if [ "$funkwhale_database_managed" = "false" ]; then
read -p "Enter your database configuration, (e.g postgresql://user@localhost:5432/database_name): " funkwhale_database_url
@@ -105,7 +105,7 @@ setup() {
echo "- domain: $funkwhale_hostname"
echo "- Admin username: $funkwhale_admin_username"
echo "- Admin email: $funkwhale_admin_email"
- echo "- Manage nginx: $funkwhale_nginx_managed"
+ echo "- Manage nginx and certbot: $funkwhale_nginx_managed"
echo "- Manage redis: $funkwhale_redis_managed"
if [ "$funkwhale_redis_managed" = "false" ]; then
echo " - Custom redis configuration: $funkwhale_redis_url"
--
GitLab