diff --git a/src/service/http.rs b/src/service/http.rs index 4bd7f25..931d388 100644 --- a/src/service/http.rs +++ b/src/service/http.rs @@ -263,6 +263,7 @@ impl Service { dns_records: &'a [service::ConfigDNSRecord], challenge_token: String, + dns_records_have_more_than_one: bool, dns_records_have_cname: bool, } @@ -304,6 +305,7 @@ impl Service { dns_records: &self.config.dns_records, challenge_token: settings_hash, + dns_records_have_more_than_one: self.config.dns_records.len() > 1, dns_records_have_cname, }, ) @@ -345,13 +347,13 @@ impl Service { } Err(domain::manager::SyncWithSettingsError::InvalidURL) => (Some( - "Fetching the git repository failed, please double check that you input the correct + "Fetching the git repository failed; please double check that you input the correct URL." .to_string(), ), false), Err(domain::manager::SyncWithSettingsError::InvalidBranchName) => (Some( - "The git repository does not have a branch of the given name, please double check + "The git repository does not have a branch of the given name; please double check that you input the correct name." .to_string(), ), false), diff --git a/src/service/http/tpl/domain.html b/src/service/http/tpl/domain.html index 13454ce..77a6d6c 100644 --- a/src/service/http/tpl/domain.html +++ b/src/service/http/tpl/domain.html @@ -4,21 +4,23 @@ {{# if data.settings }} -

Your domain {{ data.domain }} is already configured with -Domani. You can see the existing configuration below. If you modify any values -you will need to hit the "Next" button to complete the update.

+

+Your domain {{ data.domain }} is already configured using the +settings shown below. To save any changes you make here, you will need to hit +the "Next" button and follow the subsequent instructions. +

{{ else }} -

Your domain {{ data.domain }} is not yet configured with Domani. -To get started, please input the details of a public git repo which will be used -to serve your domain. When you update the given branch, your domain will be -automatically updated too!

+

+Your domain {{ data.domain }} is not yet configured. Please input +the details of a public git repo, which will be used to serve your domain. +

{{/if}} -

In the future Domani will support more backends than just git - repos.

+

In the future, Domani will support more backends than just git + repos.

@@ -54,7 +56,7 @@ automatically updated too!

This step requires a passphrase that has been given to you by the -administrator of the Domani server:

+

+This step requires a passphrase that has been given to you by the administrator +of the Domani server: +

@@ -18,9 +20,11 @@ administrator of the Domani server:

-

Next you will need to configure your nameserver to point to Domani. There are +

+Next, you will need to configure your nameserver to point to Domani. There are two entries you will need to add. The first entry tells the Domani server that -it is allowed to serve this domain with your given configuration:

+it is allowed to serve this domain with your given configuration: +

@@ -35,8 +39,15 @@ it is allowed to serve this domain with your given configuration:

-

The second entry ensures that other users find the Domani server when they -query for your domain name. It can be one or more of:

+

+The second entry ensures that other users find the Domani server when they +query for your domain name. + +{{ #if data.dns_records_have_more_than_one }} +It can be any of these: +{{ /if }} + +

@@ -59,13 +70,17 @@ query for your domain name. It can be one or more of:

{{ #if data.dns_records_have_cname }} -

(Please note that not all nameserver support using a CNAME in all cases, +

+(Please note that not all nameservers support using a CNAME in all cases, while others support it via an alternative record type like ALIAS or ANAME. If -one of those are available they can be used instead.)

+one of those are available, they can be used instead.) +

{{ /if }} -

Once both entries are installed, you can hit the following button to check +

+Once both entries are installed, you can hit the following button to check your configuration and set up your domain. Note that this step may take a long -time to complete, so if nothing happens immediately please don't panic.

+time to complete, so if nothing happens immediately please don't panic. +

diff --git a/src/service/http/tpl/domains.html b/src/service/http/tpl/domains.html index 23b380a..76fad30 100644 --- a/src/service/http/tpl/domains.html +++ b/src/service/http/tpl/domains.html @@ -1,7 +1,9 @@

All Domains

-

Below are listed all domains which this Domani instance is currently -serving

+

+These are all the domains that are currently being managed by this Domani +instance: +