updated spacing and fixed typos on all preambles

This commit is contained in:
Asif Bacchus 2019-01-05 03:53:10 -07:00
parent f22c7f4c80
commit d2e781c1b9

View File

@ -83,12 +83,11 @@ done
### get server names for this installation ### get server names for this installation
echo -e "\n${mag}NIGNX needs to know what hostnames it should answer. You can pick as many" echo -e "\n${mag}To which hostnames should NGINX answer? You can pick as many hostnames as you"
echo "hostnames as you like. Please ensure you provide fully-qualified domain" echo "like. Please ensure you provide fully-qualified domain names unless you"
echo "names unless you are providing special names such as 'localhost' and fully" echo "understand the impact not doing so."
echo "understand what that means in this context." echo -e "\nIf you are setting up SSL on this system, then make sure the hostnames match"
echo -e "\nIf you're setting up this system with SSL, then make sure your hostnames" echo "what appears on your certificates!"
echo "match what appears on your certificates!"
echo -e "\n${warn}You will be prompted to enter one hostname at a time." echo -e "\n${warn}You will be prompted to enter one hostname at a time."
echo "Provide a blank-entry (hit enter) when you're done." echo "Provide a blank-entry (hit enter) when you're done."
echo -e "'X' will exit the script, as always${norm}\n" echo -e "'X' will exit the script, as always${norm}\n"
@ -129,12 +128,13 @@ done
### SSL related options ### SSL related options
# using certbot? # using certbot?
echo -e "\n${mag}If you are using Certbot then you only need to provide the primary" echo -e "\n${mag}If you are using Certbot, you only need to provide the primary domain name"
echo "domain name of your certificate and the script will auto-generate the paths" echo "of your certificate and the script will auto-generate the paths NGINX needs to"
echo "NGINX needs for find your certificate, CA-chain and private key." echo "make everything work."
echo -e "\nIf you haven't run Certbot yet, you can enter the domain you intend to use" echo -e "\nIf you haven't run Certbot yet, you can enter the domain you intend to use"
echo "as your primary domain and the paths will still be valid. You will have to" echo "as your primary domain and the paths generated by this script will work after"
echo -e "confirm that path when prompted by the script.${norm}\n" echo -e "you run Certbot. In that case, you will have to answer ${warn}'yes'${mag} when asked"
echo -e "${warn}'Do you want to use these settings anyways?'${norm}\n"
while true; do while true; do
read -p "Are you using Certbot to handle your SSL certificates? (default: No) " yn read -p "Are you using Certbot to handle your SSL certificates? (default: No) " yn
case "${yn}" in case "${yn}" in
@ -353,11 +353,12 @@ if [ "${useCertbot}" -eq 0 ]; then
fi fi
# dhparam: get location of DH Parameters file # dhparam: get location of DH Parameters file
echo -e "\n${mag}Generating your own Diffie-Hellman Parameters file helps make your SSL" echo -e "\n${mag}Having your own unique Diffie-Hellman Parameters file makes your SSL"
echo "communication more secure by helping create unique safe large-prime numbers" echo "communication more secure by helping to generate unique safe large prime"
echo "which are used to encrypt communication. You shouldn't use the any pre-supplied" echo "numbers. You shouldn't use any pre-installed dhparams.pem files. You should"
echo "dhparams.pem files that came with NGINX or your Linux install. You should generate your own. If you want this script to do that for you, please type" echo "always generate your own. If you haven't done that already and would like this"
echo -e "${warn}generate${mag} when at the prompt instead of a path${norm}\n" echo -e "script to do it for you, please type ${warn}generate${mag} at the prompt instead"
echo -e "of a path${norm}\n"
while true; do while true; do
read -p "What is the path to your DH Parameters file? (default: /etc/ssl/certs/dhparam.pem) " inputDHPath read -p "What is the path to your DH Parameters file? (default: /etc/ssl/certs/dhparam.pem) " inputDHPath
case "${inputDHPath}" in case "${inputDHPath}" in
@ -429,13 +430,13 @@ done
### PHP-FPM related options ### PHP-FPM related options
# get PHP-FPM usage status # get PHP-FPM usage status
echo -e "\n${mag}PHP-FPM allows your server to process and serve dynamic PHP content. If you" echo -e "\n${mag}PHP-FPM allows your server to process and serve dynamic PHP content. If you"
echo "have PHP-FPM installed then NGINX needs to know how to access it. The following" echo "have PHP-FPM installed, NGINX needs to know how to access it. The following"
echo "questions will allow the script to auto-configure that for you. If you have" echo "questions will allow the script to auto-configure that for you."
echo "not yet installed PHP-FPM but intend to in the future, you can answer yes and" echo -e "\nIf you have not yet installed PHP-FPM but intend to do so in the future, you"
echo "provide details for your intended setup so the script can still generate the" echo -e "can answer ${warn}yes${mag} and provide details for your intended setup so the script can"
echo -e "configuration for you.${norm}\n" echo -e "generate a configuration that will work once your PHP-FPM is set up.${norm}\n"
while true; do while true; do
read -p "Are you using PHP-FPM? (default: YES) " yn read -p "Are you using PHP-FPM? (default: Yes) " yn
case $yn in case $yn in
[Yy]*|'') [Yy]*|'')
usePHP=1 usePHP=1