diff --git a/LICENSE b/LICENSE index 6d480d0..1fd4e67 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -happyDNS Licensing +happyDomain Licensing SOFTWARE LICENSING @@ -9,10 +9,10 @@ by the happyDNS team in one of two ways: 2. Under a commercial license available from the happyDNS team by contacting contact@happydns.org. -happyDNS TRADEMARK GUIDELINES +happyDNS and happyDomain TRADEMARK GUIDELINES -Your use of the mark happyDNS is subject to the happyDNS team's prior written -approval and our organization’s Trademark Standards of Use at +Your use of the mark happyDNS and happyDomain is subject to the happyDNS team's +prior written approval and our organization’s Trademark Standards of Use at http://www.happydns.org/trademark-standards-of-use/. For trademark approval or any questions you have about using these trademarks, please email contact@happydns.org diff --git a/README.md b/README.md index f9e1fae..3606b18 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -happyDNS -======== +happyDomain +=========== Finally a simple, modern and open source interface for domain name. @@ -16,7 +16,7 @@ Building ### Dependencies -In order to build the happyDNS project, you'll need the following dependencies: +In order to build the happyDomain project, you'll need the following dependencies: * `go` at least version 1.16 * `nodejs` tested with version 14.4.0 @@ -62,7 +62,7 @@ After some initializations, it should show you: Admin listening on ./happydns.sock Ready, listening on :8081 -Go to http://localhost:8081/ to start using happyDNS. +Go to http://localhost:8081/ to start using happyDomain. ### Database configuration diff --git a/actions/users.go b/actions/users.go index a5422bb..369db57 100644 --- a/actions/users.go +++ b/actions/users.go @@ -71,8 +71,8 @@ func SendValidationLink(opts *config.Options, user *happydns.UserAuth) error { toName := genUsername(user) return utils.SendMail( &mail.Address{Name: toName, Address: user.Email}, - "Your new account on happyDNS", - `Welcome to happyDNS! + "Your new account on happyDomain", + `Welcome to happyDomain! -------------------- Hi `+toName+`, @@ -90,7 +90,7 @@ func SendRecoveryLink(opts *config.Options, user *happydns.UserAuth) error { toName := genUsername(user) return utils.SendMail( &mail.Address{Name: toName, Address: user.Email}, - "Recover you happyDNS account", + "Recover you happyDomain account", `Hi `+toName+`, You've just ask on our platform to recover your account. diff --git a/main.go b/main.go index 51f2651..587174d 100644 --- a/main.go +++ b/main.go @@ -56,7 +56,7 @@ var ( func main() { var err error - log.Println("This is happyDNS", Version) + log.Println("This is happyDomain", Version) rand.Seed(time.Now().UTC().UnixNano()) // Load and parse options diff --git a/providers/ovh_settings.go b/providers/ovh_settings.go index c994f39..9ffe270 100644 --- a/providers/ovh_settings.go +++ b/providers/ovh_settings.go @@ -96,7 +96,7 @@ func settingsAskCredentials(cfg *config.Options, recallid int64, session *happyd // Return some explanation to the user return &forms.CustomForm{ - BeforeText: "In order allows happyDNS to get and update yours domains, you have to let us access them. To avoid storing your credentials, we will store a unique token that will be associated with your account. For this purpose, you will be redirected to an OVH login screen. The registration will automatically continue", + BeforeText: "In order allows happyDomain to get and update yours domains, you have to let us access them. To avoid storing your credentials, we will store a unique token that will be associated with your account. For this purpose, you will be redirected to an OVH login screen. The registration will automatically continue", NextButtonText: "Go to OVH", PreviousButtonText: "< Previous", NextButtonLink: response.ValidationURL, diff --git a/services/orphan.go b/services/orphan.go index 34c009e..a969514 100644 --- a/services/orphan.go +++ b/services/orphan.go @@ -68,7 +68,7 @@ func init() { nil, ServiceInfos{ Name: "Orphan Record", - Description: "A record not yet handled by happyDNS. Ask us to support it.", + Description: "A record not yet handled by happyDomain. Ask us to support it.", Categories: []string{}, }, 99999999, diff --git a/storage/leveldb/updates.go b/storage/leveldb/updates.go index 5b63a65..f055986 100644 --- a/storage/leveldb/updates.go +++ b/storage/leveldb/updates.go @@ -67,7 +67,7 @@ func (s *LevelDBStorage) DoMigration() (err error) { } if version > len(migrations) { - return fmt.Errorf("Your database has revision %d, which is newer than the revision this happyDNS version can handle (max DB revision %d). Please update happyDNS", version, len(migrations)) + return fmt.Errorf("Your database has revision %d, which is newer than the revision this happyDomain version can handle (max DB revision %d). Please update happyDomain", version, len(migrations)) } for v, migration := range migrations[version:] { diff --git a/ui/package.json b/ui/package.json index 4927d07..ccff0e5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,5 +1,5 @@ { - "name": "happyDNS", + "name": "happyDomain", "version": "0.1.0", "private": true, "scripts": { diff --git a/ui/public/img/happyDomain.png b/ui/public/img/happyDomain.png new file mode 100644 index 0000000..9612515 Binary files /dev/null and b/ui/public/img/happyDomain.png differ diff --git a/ui/public/img/happyDomain.svg b/ui/public/img/happyDomain.svg new file mode 100644 index 0000000..7782796 --- /dev/null +++ b/ui/public/img/happyDomain.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/ui/public/index.html b/ui/public/index.html index 16a5ebd..94977a6 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -8,7 +8,7 @@ - happyDNS + happyDomain