Tidy install options docs (hestiacp#4074)

AlecRust · web-flow · commit 5187e7944634 · 2023-10-24T22:45:03.000+02:00
* Fix indentation of --username option

* Add Username and Web Terminal options to install builder

* Fix inconsistencies in install option docs

* Improve option description

* Remove unsightly border

* Fix typos

* Improve spacing
diff --git a/bin/v-list-default-php b/bin/v-list-default-php
@@ -4,7 +4,7 @@
 #
 # example: v-list-default-php
 #
-# List the default version used by de the default template
+# List the default version used by the default template
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #
diff --git a/docs/_data/options.js b/docs/_data/options.js
@@ -9,7 +9,7 @@ export const options = [
 	{
 		flag: 'lang',
 		label: 'Language',
-		description: 'Change the ISO 639-1 language code',
+		description: 'Change the interface language',
 		type: 'select',
 		default: 'en',
 		options: [
@@ -64,6 +64,13 @@ export const options = [
 		type: 'text',
 		default: '',
 	},
+	{
+		flag: 'username',
+		label: 'Username',
+		description: 'Set the admin account username',
+		type: 'text',
+		default: '',
+	},
 	{
 		flag: 'email',
 		label: 'Email',
@@ -180,6 +187,12 @@ export const options = [
 		description: 'Use hard disk space limits on user packages',
 		default: 'no',
 	},
+	{
+		flag: 'webterminal',
+		label: 'Web Terminal',
+		description: 'Web-based SSH terminal',
+		default: 'no',
+	},
 	{
 		flag: 'api',
 		label: 'Hestia API',
diff --git a/docs/docs/introduction/getting-started.md b/docs/docs/introduction/getting-started.md
@@ -75,7 +75,7 @@ bash hst-install.sh -h
 ### List of installation options
 
 ::: tip
-An easier way to choose your installation options is by using the [Install string generator](/install).
+An easier way to choose your installation options is by using the [Install script generator](/install).
 :::
 
 To choose what software gets installed, you can provide flags to the installation script. You can view the full list of options below.
@@ -88,22 +88,24 @@ To choose what software gets installed, you can provide flags to the installatio
 -j, --proftpd Install ProFTPD [yes | no] default: no
 -k, --named Install BIND [yes | no] default: yes
 -m, --mysql Install MariaDB [yes | no] default: yes
--M, --mysql8 Install Mysql8 [yes | no] default: no
+-M, --mysql8 Install MySQL 8 [yes | no] default: no
 -g, --postgresql Install PostgreSQL [yes | no] default: no
 -x, --exim Install Exim [yes | no] default: yes
 -z, --dovecot Install Dovecot [yes | no] default: yes
 -Z, --sieve Install Sieve [yes | no] default: no
 -c, --clamav Install ClamAV [yes | no] default: yes
 -t, --spamassassin Install SpamAssassin [yes | no] default: yes
--i, --iptables Install Iptables [yes | no] default: yes
--b, --fail2ban Install Fail2ban [yes | no] default: yes
+-i, --iptables Install iptables [yes | no] default: yes
+-b, --fail2ban Install Fail2Ban [yes | no] default: yes
 -q, --quota Filesystem Quota [yes | no] default: no
+-W, --webterminal Web Terminal [yes | no] default: no
 -d, --api Activate API [yes | no] default: yes
 -r, --port Change Backend Port default: 8083
 -l, --lang Default language default: en
 -y, --interactive Interactive install [yes | no] default: yes
 -s, --hostname Set hostname
 -e, --email Set admin email
+-u, --username Set admin user
 -p, --password Set admin password
 -D, --with-debs Path to Hestia debs
 -f, --force Force installation
diff --git a/docs/docs/reference/cli.md b/docs/docs/reference/cli.md
@@ -4279,7 +4279,7 @@ list default PHP version used by default.tpl
 
 **Options**: `[FORMAT]`
 
-List the default version used by de the default template
+List the default version used by the default template
 
 ## v-list-dns-domain
 
diff --git a/docs/docs/server-administration/email.md b/docs/docs/server-administration/email.md
@@ -39,7 +39,7 @@ If not, you have 2 options:
 
 ## What is an SMTP relay service and how to set it up
 
-SMTP mail relay is the process of transferring an email from one server to another for delivery. Often email from a server is blocked by de service provider due to fear of spam. Or the IP reputation is so low that all email go straight into the spam box. To prevent such issues a lot of companies offer a SMTP relay that takes care of the delivery part. As they send a lot email via the same ip addresses they have a better reputation.
+SMTP mail relay is the process of transferring an email from one server to another for delivery. Often email from a server is blocked by the service provider due to fear of spam. Or the IP reputation is so low that all email go straight into the spam box. To prevent such issues a lot of companies offer a SMTP relay that takes care of the delivery part. As they send a lot email via the same ip addresses they have a better reputation.
 
 To setup create a account by the provider you want or use and follow their instruction to update your DNS. When completed you can enter the SMTP user account they provider in the settings under "Global SMTP" or under the "Edit mail domain" -> "SMTP relay"
 
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -55,29 +55,29 @@ help() {
 	echo "Usage: $0 [OPTIONS]
   -a, --apache            Install Apache        [yes|no]  default: yes
   -w, --phpfpm            Install PHP-FPM       [yes|no]  default: yes
-  -o, --multiphp          Install Multi-PHP     [yes|no]  default: no
-  -v, --vsftpd            Install Vsftpd        [yes|no]  default: yes
+  -o, --multiphp          Install MultiPHP      [yes|no]  default: no
+  -v, --vsftpd            Install VSFTPD        [yes|no]  default: yes
   -j, --proftpd           Install ProFTPD       [yes|no]  default: no
-  -k, --named             Install Bind          [yes|no]  default: yes
+  -k, --named             Install BIND          [yes|no]  default: yes
   -m, --mysql             Install MariaDB       [yes|no]  default: yes
-  -M, --mysql8            Install MySQL         [yes|no]  default: no
+  -M, --mysql8            Install MySQL 8       [yes|no]  default: no
   -g, --postgresql        Install PostgreSQL    [yes|no]  default: no
   -x, --exim              Install Exim          [yes|no]  default: yes
   -z, --dovecot           Install Dovecot       [yes|no]  default: yes
   -Z, --sieve             Install Sieve         [yes|no]  default: no
   -c, --clamav            Install ClamAV        [yes|no]  default: yes
   -t, --spamassassin      Install SpamAssassin  [yes|no]  default: yes
-  -i, --iptables          Install Iptables      [yes|no]  default: yes
-  -b, --fail2ban          Install Fail2ban      [yes|no]  default: yes
+  -i, --iptables          Install iptables      [yes|no]  default: yes
+  -b, --fail2ban          Install Fail2Ban      [yes|no]  default: yes
   -q, --quota             Filesystem Quota      [yes|no]  default: no
-  -W, --webterminal       Web terminal          [yes|no]  default: no
+  -W, --webterminal       Web Terminal          [yes|no]  default: no
   -d, --api               Activate API          [yes|no]  default: yes
   -r, --port              Change Backend Port             default: 8083
   -l, --lang              Default language                default: en
   -y, --interactive       Interactive install   [yes|no]  default: yes
   -s, --hostname          Set hostname
   -e, --email             Set admin email
-	-u, --username          Set admin user
+  -u, --username          Set admin user
   -p, --password          Set admin password
   -D, --with-debs         Path to Hestia debs
   -f, --force             Force installation
diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -55,20 +55,20 @@ help() {
 	echo "Usage: $0 [OPTIONS]
   -a, --apache            Install Apache        [yes|no]  default: yes
   -w, --phpfpm            Install PHP-FPM       [yes|no]  default: yes
-  -o, --multiphp          Install Multi-PHP     [yes|no]  default: no
-  -v, --vsftpd            Install Vsftpd        [yes|no]  default: yes
+  -o, --multiphp          Install MultiPHP      [yes|no]  default: no
+  -v, --vsftpd            Install VSFTPD        [yes|no]  default: yes
   -j, --proftpd           Install ProFTPD       [yes|no]  default: no
-  -k, --named             Install Bind          [yes|no]  default: yes
+  -k, --named             Install BIND          [yes|no]  default: yes
   -m, --mysql             Install MariaDB       [yes|no]  default: yes
-  -M, --mysql8            Install MySQL         [yes|no]  default: no
+  -M, --mysql8            Install MySQL 8       [yes|no]  default: no
   -g, --postgresql        Install PostgreSQL    [yes|no]  default: no
   -x, --exim              Install Exim          [yes|no]  default: yes
   -z, --dovecot           Install Dovecot       [yes|no]  default: yes
   -Z, --sieve             Install Sieve         [yes|no]  default: no
   -c, --clamav            Install ClamAV        [yes|no]  default: yes
   -t, --spamassassin      Install SpamAssassin  [yes|no]  default: yes
-  -i, --iptables          Install Iptables      [yes|no]  default: yes
-  -b, --fail2ban          Install Fail2ban      [yes|no]  default: yes
+  -i, --iptables          Install iptables      [yes|no]  default: yes
+  -b, --fail2ban          Install Fail2Ban      [yes|no]  default: yes
   -q, --quota             Filesystem Quota      [yes|no]  default: no
   -W, --webterminal       Web Terminal          [yes|no]  default: no
   -d, --api               Activate API          [yes|no]  default: yes
@@ -77,7 +77,7 @@ help() {
   -y, --interactive       Interactive install   [yes|no]  default: yes
   -s, --hostname          Set hostname
   -e, --email             Set admin email
-	-u, --username          Set admin user
+  -u, --username          Set admin user
   -p, --password          Set admin password
   -D, --with-debs         Path to Hestia debs
   -f, --force             Force installation
diff --git a/web/css/src/themes/default.css b/web/css/src/themes/default.css
@@ -1195,7 +1195,6 @@
 .card-content {
 	padding: 10px;
 	color: #353535;
-	border-top: 1px solid #e6e6e6;
 	text-align: center;
 }
 
diff --git a/web/templates/pages/edit_mail.php b/web/templates/pages/edit_mail.php
@@ -133,7 +133,7 @@ class="<?= $v_status ?> js-enable-inputs-on-submit"
 					</div>
 				</div>
 				<?php if ($v_ssl != "no") { ?>
-					<ul class="values-list">
+					<ul class="values-list u-mb20">
 						<li class="values-list-item">
 							<span class="values-list-label"><?= _("Issued To") ?></span>
 							<span class="values-list-value"><?= htmlentities($v_ssl_subject) ?></span>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# example: v-list-default-php`
`6`	`6`	`#`
`7`		`-# List the default version used by de the default template`
	`7`	`+# List the default version used by the default template`
`8`	`8`
`9`	`9`	`#----------------------------------------------------------#`
`10`	`10`	`# Variables & Functions #`
Original file line number	Diff line number	Diff line change
`@@ -1195,7 +1195,6 @@`
`1195`	`1195`	`.card-content {`
`1196`	`1196`	`padding: 10px;`
`1197`	`1197`	`color: #353535;`
`1198`		`- border-top: 1px solid #e6e6e6;`
`1199`	`1198`	`text-align: center;`
`1200`	`1199`	`}`
`1201`	`1200`