From e9b97a6e14a4a6ae52998e9d0761bb97bfb9a4f8 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 8 Jan 2022 20:36:05 +0100 Subject: [PATCH 1/2] Switch config to YAML --- config.toml | 137 ---------------------------------------------------- config.yml | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 137 deletions(-) delete mode 100644 config.toml create mode 100644 config.yml diff --git a/config.toml b/config.toml deleted file mode 100644 index a944f70..0000000 --- a/config.toml +++ /dev/null @@ -1,137 +0,0 @@ -title = "happyDNS" -baseURL = "https://www.happydns.org/" - -defaultContentLanguageInSubdir = true -removePathAccents = true - -[Author] - name = "happyDNS team" - framagit = "happyDNS/" - -[languages] - [languages.en] - title = "happyDNS. Finally a simple interface for domain names." - weight = 1 - - [languages.fr] - title = "happyDNS. L'interface des noms de domaines." - weight = 2 - [languages.fr.menu] - [[languages.fr.menu.main]] - identifier = "features" - name = "Fonctionnalités" - url = "/fr/#features" - weight = 10 - - [[languages.fr.menu.main]] - identifier = "downloads" - name = "Téléchargements" - url = "/fr/#downloads" - weight = 20 - -# [[languages.fr.menu.main]] -# identifier = "blog" -# name = "Blog" -# url = "https://blog.happydns.org/" -# weight = 30 - - [languages.fr.params] - [[languages.fr.params.carousel]] - title = "domains-lists" - description = "**Page d'accueil:** liste des domaines, de différents hébergeurs" - image = "/img/screenshots/domains-list.png" - - [[languages.fr.params.carousel]] - title = "domain-abstract" - description = "Une zone simplifiée" - image = "/img/screenshots/domain-abstract.png" - - [[languages.fr.params.carousel]] - title = "domain-abstract-list" - description = "Une zone simplifiée, sous forme de liste, plus rapide à modifier" - image = "/img/screenshots/domain-abstract-list.png" - - [[languages.fr.params.carousel]] - title = "zone-diff" - description = "Liste les changements avant d'appliquer les modifications" - image = "/img/screenshots/zone-diff.png" - - [[languages.fr.params.carousel]] - title = "domain-records" - description = "Les enregistrements d'une zone, modifiable depuis l'interface" - image = "/img/screenshots/domain-records.png" - - [[languages.fr.params.carousel]] - title = "domain-source" - description = "Informations sur la source" - image = "/img/screenshots/domain-source.png" - - [[languages.fr.params.carousel]] - title = "sources" - description = "Liste des sources existantes où récupérer les domaines" - image = "/img/screenshots/sources.png" - -[params] -newsletter = "newsletter@happydns.org" -tryit = "/join" - - [[params.carousel]] - title = "domains-lists" - description = "**Home page:** domains list on dedicated provider" - image = "/img/screenshots/domains-list.png" - - [[params.carousel]] - title = "domain-abstract" - description = "Simplified zone: records grouped by services" - image = "/img/screenshots/domain-abstract.png" - - [[params.carousel]] - title = "domain-abstract-list" - description = "Simplified zone in list, for quicker editing" - image = "/img/screenshots/domain-abstract-list.png" - - [[params.carousel]] - title = "zone-diff" - description = "Display zone diff before applying changes" - image = "/img/screenshots/zone-diff.png" - - [[params.carousel]] - title = "domain-records" - description = "Resource records for a zone: editable through happyDNS" - image = "/img/screenshots/domain-records.png" - - [[params.carousel]] - title = "domain-source" - description = "Information about the source" - image = "/img/screenshots/domain-source.png" - - [[params.carousel]] - title = "sources" - description = "Existing sources where pull domains" - image = "/img/screenshots/sources.png" - -[menu] - [[menu.main]] - identifier = "features" - name = "Features" - url = "/en/#features" - weight = 10 - - [[menu.main]] - identifier = "downloads" - name = "Downloads" - url = "/en/#downloads" - weight = 20 - -# [[menu.main]] -# identifier = "blog" -# name = "Blog" -# url = "https://blog.happydns.org/" -# weight = 30 - -[markup] - [markup.goldmark] - [markup.goldmark.renderer] - unsafe = true -[outputs] - home = [ "HTML", "RSS" ] diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..2441df2 --- /dev/null +++ b/config.yml @@ -0,0 +1,123 @@ +title: "happyDNS" +baseURL: "https://www.happydns.org/" + +defaultContentLanguageInSubdir: true +removePathAccents: true + +author: + name: "happyDNS team" + framagit: "happyDNS/" + +languages: + en: + title: "happyDNS. Finally a simple interface for domain names." + weight: 1 + + fr: + title: "happyDNS. L'interface des noms de domaines." + weight: 2 + + menu: + main: + - identifier: "features" + name: "Fonctionnalités" + url: "/fr/#features" + weight: 10 + + - identifier: "downloads" + name: "Téléchargements" + url: "/fr/#downloads" + weight: 20 + +# - identifier: "blog" +# name: "Blog" +# url: "https://blog.happydns.org/" +# weight: 30 + + params: + carousel: + - title: "domains-lists" + description: "**Page d'accueil:** liste des domaines, de différents hébergeurs" + image: "/img/screenshots/domains-list.png" + + - title: "domain-abstract" + description: "Une zone simplifiée" + image: "/img/screenshots/domain-abstract.png" + + - title: "domain-abstract-list" + description: "Une zone simplifiée, sous forme de liste, plus rapide à modifier" + image: "/img/screenshots/domain-abstract-list.png" + + - title: "zone-diff" + description: "Liste les changements avant d'appliquer les modifications" + image: "/img/screenshots/zone-diff.png" + + - title: "domain-records" + description: "Les enregistrements d'une zone, modifiable depuis l'interface" + image: "/img/screenshots/domain-records.png" + + - title: "domain-source" + description: "Informations sur la source" + image: "/img/screenshots/domain-source.png" + + - title: "sources" + description: "Liste des sources existantes où récupérer les domaines" + image: "/img/screenshots/sources.png" + +params: + newsletter: "newsletter@happydns.org" + tryit: "/join" + + carousel: + - title: "domains-lists" + description: "**Home page:** domains list on dedicated provider" + image: "/img/screenshots/domains-list.png" + + - title: "domain-abstract" + description: "Simplified zone: records grouped by services" + image: "/img/screenshots/domain-abstract.png" + + - title: "domain-abstract-list" + description: "Simplified zone in list, for quicker editing" + image: "/img/screenshots/domain-abstract-list.png" + + - title: "zone-diff" + description: "Display zone diff before applying changes" + image: "/img/screenshots/zone-diff.png" + + - title: "domain-records" + description: "Resource records for a zone: editable through happyDNS" + image: "/img/screenshots/domain-records.png" + + - title: "domain-source" + description: "Information about the source" + image: "/img/screenshots/domain-source.png" + + - title: "sources" + description: "Existing sources where pull domains" + image: "/img/screenshots/sources.png" + +menu: + main: + - identifier: "features" + name: "Features" + url: "/en/#features" + weight: 10 + + - identifier: "downloads" + name: "Downloads" + url: "/en/#downloads" + weight: 20 + +# - identifier: "blog" +# name: "Blog" +# url: "https://blog.happydns.org/" +# weight: 30 + +markup: + goldmark: + renderer: + unsafe: true + +outputs: + home: [ "HTML", "RSS" ] From 0e09858d2a3b52c16319e8b0dd7f08db556c92cb Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 8 Jan 2022 20:47:46 +0100 Subject: [PATCH 2/2] Switch to happyDomain --- config.yml | 14 +++++++------- content/502.en.md | 2 +- content/legal-notice.en.md | 2 +- .../cio.en.html | 2 +- .../cio.fr.html | 2 +- .../devops.en.md | 0 .../devops.fr.md | 0 .../freelance.en.html | 2 +- .../freelance.fr.html | 2 +- .../geek.en.html | 2 +- .../geek.fr.html | 2 +- .../sysadmin.en.html | 2 +- .../sysadmin.fr.html | 2 +- i18n/en.yaml | 10 +++++----- i18n/fr.yaml | 14 +++++++------- layouts/partials/breadcrumbs_usage.html | 16 ++++++++-------- layouts/partials/footer.html | 8 ++++---- layouts/partials/jumbo.html | 8 ++++---- layouts/partials/nav.html | 6 +++--- 19 files changed, 48 insertions(+), 48 deletions(-) rename content/{use-happyDNS => use-happyDomain}/cio.en.html (99%) rename content/{use-happyDNS => use-happyDomain}/cio.fr.html (99%) rename content/{use-happyDNS => use-happyDomain}/devops.en.md (100%) rename content/{use-happyDNS => use-happyDomain}/devops.fr.md (100%) rename content/{use-happyDNS => use-happyDomain}/freelance.en.html (99%) rename content/{use-happyDNS => use-happyDomain}/freelance.fr.html (99%) rename content/{use-happyDNS => use-happyDomain}/geek.en.html (99%) rename content/{use-happyDNS => use-happyDomain}/geek.fr.html (99%) rename content/{use-happyDNS => use-happyDomain}/sysadmin.en.html (99%) rename content/{use-happyDNS => use-happyDomain}/sysadmin.fr.html (99%) diff --git a/config.yml b/config.yml index 2441df2..370900a 100644 --- a/config.yml +++ b/config.yml @@ -1,5 +1,5 @@ -title: "happyDNS" -baseURL: "https://www.happydns.org/" +title: "happyDomain" +baseURL: "https://www.happydomain.org/" defaultContentLanguageInSubdir: true removePathAccents: true @@ -10,11 +10,11 @@ author: languages: en: - title: "happyDNS. Finally a simple interface for domain names." + title: "happyDomain. Finally a simple interface for domain names." weight: 1 fr: - title: "happyDNS. L'interface des noms de domaines." + title: "happyDomain. L'interface des noms de domaines." weight: 2 menu: @@ -31,7 +31,7 @@ languages: # - identifier: "blog" # name: "Blog" -# url: "https://blog.happydns.org/" +# url: "https://blog.happydomain.org/" # weight: 30 params: @@ -86,7 +86,7 @@ params: image: "/img/screenshots/zone-diff.png" - title: "domain-records" - description: "Resource records for a zone: editable through happyDNS" + description: "Resource records for a zone: editable through happyDomain" image: "/img/screenshots/domain-records.png" - title: "domain-source" @@ -111,7 +111,7 @@ menu: # - identifier: "blog" # name: "Blog" -# url: "https://blog.happydns.org/" +# url: "https://blog.happydomain.org/" # weight: 30 markup: diff --git a/content/502.en.md b/content/502.en.md index 360e9f2..3863df8 100644 --- a/content/502.en.md +++ b/content/502.en.md @@ -1,5 +1,5 @@ +++ -title = "happyDNS Unavailable" +title = "happyDomain Unavailable" +++ diff --git a/content/legal-notice.en.md b/content/legal-notice.en.md index 6dcc4be..cba0ef9 100644 --- a/content/legal-notice.en.md +++ b/content/legal-notice.en.md @@ -41,4 +41,4 @@ an identifier, means of account retrieval or possibly the sending of our newsletter). You can contact our data protection officer by e-mail at dpo at -happydns.org or by mail to our headquarters address. +happydomain.org or by mail to our headquarters address. diff --git a/content/use-happyDNS/cio.en.html b/content/use-happyDomain/cio.en.html similarity index 99% rename from content/use-happyDNS/cio.en.html rename to content/use-happyDomain/cio.en.html index c9c45a1..55593c4 100644 --- a/content/use-happyDNS/cio.en.html +++ b/content/use-happyDomain/cio.en.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/cio.fr.html b/content/use-happyDomain/cio.fr.html similarity index 99% rename from content/use-happyDNS/cio.fr.html rename to content/use-happyDomain/cio.fr.html index 699c7dd..f4fd539 100644 --- a/content/use-happyDNS/cio.fr.html +++ b/content/use-happyDomain/cio.fr.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/devops.en.md b/content/use-happyDomain/devops.en.md similarity index 100% rename from content/use-happyDNS/devops.en.md rename to content/use-happyDomain/devops.en.md diff --git a/content/use-happyDNS/devops.fr.md b/content/use-happyDomain/devops.fr.md similarity index 100% rename from content/use-happyDNS/devops.fr.md rename to content/use-happyDomain/devops.fr.md diff --git a/content/use-happyDNS/freelance.en.html b/content/use-happyDomain/freelance.en.html similarity index 99% rename from content/use-happyDNS/freelance.en.html rename to content/use-happyDomain/freelance.en.html index 2a7641a..dcc730d 100644 --- a/content/use-happyDNS/freelance.en.html +++ b/content/use-happyDomain/freelance.en.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/freelance.fr.html b/content/use-happyDomain/freelance.fr.html similarity index 99% rename from content/use-happyDNS/freelance.fr.html rename to content/use-happyDomain/freelance.fr.html index 8393e6c..07c1088 100644 --- a/content/use-happyDNS/freelance.fr.html +++ b/content/use-happyDomain/freelance.fr.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/geek.en.html b/content/use-happyDomain/geek.en.html similarity index 99% rename from content/use-happyDNS/geek.en.html rename to content/use-happyDomain/geek.en.html index 00d8dd4..2a0c62e 100644 --- a/content/use-happyDNS/geek.en.html +++ b/content/use-happyDomain/geek.en.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/geek.fr.html b/content/use-happyDomain/geek.fr.html similarity index 99% rename from content/use-happyDNS/geek.fr.html rename to content/use-happyDomain/geek.fr.html index 3f80c31..23a41a9 100644 --- a/content/use-happyDNS/geek.fr.html +++ b/content/use-happyDomain/geek.fr.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/sysadmin.en.html b/content/use-happyDomain/sysadmin.en.html similarity index 99% rename from content/use-happyDNS/sysadmin.en.html rename to content/use-happyDomain/sysadmin.en.html index 4a65e60..37ed900 100644 --- a/content/use-happyDNS/sysadmin.en.html +++ b/content/use-happyDomain/sysadmin.en.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/content/use-happyDNS/sysadmin.fr.html b/content/use-happyDomain/sysadmin.fr.html similarity index 99% rename from content/use-happyDNS/sysadmin.fr.html rename to content/use-happyDomain/sysadmin.fr.html index 5bf426c..7e7f7db 100644 --- a/content/use-happyDNS/sysadmin.fr.html +++ b/content/use-happyDomain/sysadmin.fr.html @@ -1,5 +1,5 @@ +++ -title = "Comment happyDNS peut vous aider ?" +title = "Comment happyDomain peut vous aider ?" layout = "usage" +++ diff --git a/i18n/en.yaml b/i18n/en.yaml index 78dbc89..6fc17d7 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -8,7 +8,7 @@ translation: "Try it online now" - id: tryhappydns - translation: "Try happyDNS now" + translation: "Try happyDomain now" - id: downloadit translation: "Download now" @@ -73,13 +73,13 @@ translation: | Our source code is freely available under the [CeCILL license](http://cecill.info/licences/Licence_CeCILL_V2.1-en.html) in our [git repository](https://git.happydns.org/), hosted by Framagit. - You can download the latest [*nightly* version](https://get.happydns.org/master/) of happyDNS for [Linux x86_64](https://get.happydns.org/master/happydns-linux-amd64), [Linux arm64](https://get.happydns.org/master/happydns-linux-arm64) or [macOS x86_64](https://get.happydns.org/master/happydns-darwin-amd64). + You can download the latest [*nightly* version](https://get.happydns.org/master/) of happyDomain for [Linux x86_64](https://get.happydomain.org/master/happydns-linux-amd64), [Linux arm64](https://get.happydomain.org/master/happydns-linux-arm64) or [macOS x86_64](https://get.happydomain.org/master/happydns-darwin-amd64). We publish a [Docker image](https://hub.docker.com/r/happydns/happydns/), feel free to test it thanks to: docker run -e HAPPYDNS_NO_AUTH=1 -p 8081:8081 happydns/happydns - Precompiled binaries are also availables on . + Precompiled binaries are also availables on . - id: community-chat translation: "Chat" @@ -97,7 +97,7 @@ translation: "Translations" - id: community-translation-text translation: | - You speak another language than French or English? Give a hand to translate happyDNS. Write us at `contact at happydns.org`. + You speak another language than French or English? Give a hand to translate happyDomain. Write us at `contact at happydomain.org`. - id: community-code translation: "Code" @@ -109,7 +109,7 @@ translation: "Contact" - id: community-contact-text translation: | - Need more? Contact us at `contact at happydns.org`. + Need more? Contact us at `contact at happydomain.org`. - id: survey-title translation: "We're going for it!" diff --git a/i18n/fr.yaml b/i18n/fr.yaml index fe919c9..f06be71 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -8,7 +8,7 @@ translation: "Essayer en ligne maintenant" - id: tryhappydns - translation: "Essayer happyDNS maintenant" + translation: "Essayer happyDomain maintenant" - id: downloadit translation: "Télécharger" @@ -71,15 +71,15 @@ - id: downloads-text translation: | - Le code source de notre projet est libre ; il est disponible sous les termes de la [licence CeCILL](http://cecill.info/licences/Licence_CeCILL_V2.1-fr.html) dans notre [dépôt Git](https://git.happydns.org/), hébergé par Framagit. + Le code source de notre projet est libre ; il est disponible sous les termes de la [licence CeCILL](http://cecill.info/licences/Licence_CeCILL_V2.1-fr.html) dans notre [dépôt Git](https://git.happydomain.org/), hébergé par Framagit. - Téléchargez la dernière [version *nightly*](https://get.happydns.org/master/) d'happyDNS pour [Linux x86_64](https://get.happydns.org/master/happydns-linux-amd64), [Linux arm64](https://get.happydns.org/master/happydns-linux-arm64) ou [macOS x86_64](https://get.happydns.org/master/happydns-darwin-amd64). + Téléchargez la dernière [version *nightly*](https://get.happydomain.org/master/) d'happyDomain pour [Linux x86_64](https://get.happydomain.org/master/happydns-linux-amd64), [Linux arm64](https://get.happydomain.org/master/happydns-linux-arm64) ou [macOS x86_64](https://get.happydomain.org/master/happydns-darwin-amd64). Vous préférez une [image Docker](https://hub.docker.com/r/happydns/happydns/) ? Essayez-la docker run -e HAPPYDNS_NO_AUTH=1 -p 8081:8081 happydns/happydns - Les binaires précompilés sont disponibles sur . + Les binaires précompilés sont disponibles sur . - id: community-chat translation: "Chat" @@ -97,19 +97,19 @@ translation: "Traductions" - id: community-translation-text translation: | - Vous parlez une langue étrangère ? Traduisez happyDNS. Contactez-nous par email `contact at happydns.org`. + Vous parlez une langue étrangère ? Traduisez happyDomain. Contactez-nous par email `contact at happydomain.org`. - id: community-code translation: "Code" - id: community-code-text translation: | - Vous savez programmer ? Contribuez à améliorer le logiciel via notre [dépôt Git](https://git.happydns.org/) sur Framagit. + Vous savez programmer ? Contribuez à améliorer le logiciel via notre [dépôt Git](https://git.happydomain.org/) sur Framagit. - id: community-contact translation: "Contact" - id: community-contact-text translation: | - Autre chose ? Contactez-nous à `contact at happydns.org`. + Autre chose ? Contactez-nous à `contact at happydomain.org`. - id: survey-title translation: "On se lance dans l'aventure !" diff --git a/layouts/partials/breadcrumbs_usage.html b/layouts/partials/breadcrumbs_usage.html index a1721dd..71ea7aa 100644 --- a/layouts/partials/breadcrumbs_usage.html +++ b/layouts/partials/breadcrumbs_usage.html @@ -2,19 +2,19 @@
Découvrez - - happyDNS + + happyDomain - + pour :
    -
  1. {{ i18n "freelance" }}
    2. -
  2. {{ i18n "sysadmin" }}
    3. -
  3. {{ i18n "devops" }}
    4. -
  4. {{ i18n "cio" }}
    5. -
  5. {{ i18n "geek" }}
    6. +
  6. {{ i18n "freelance" }}
    7. +
  7. {{ i18n "sysadmin" }}
    8. +
  8. {{ i18n "devops" }}
    9. +
  9. {{ i18n "cio" }}
    10. +
  10. {{ i18n "geek" }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a0be245..b80b2d8 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -3,12 +3,12 @@
© - - happyDNS + + happyDomain - + - 2019-2021 + 2019-2022
diff --git a/layouts/partials/jumbo.html b/layouts/partials/jumbo.html index 9b46d8f..16570d3 100644 --- a/layouts/partials/jumbo.html +++ b/layouts/partials/jumbo.html @@ -22,7 +22,7 @@
- + {{ i18n {{ i18n "freelance" }} @@ -30,7 +30,7 @@
- + {{ i18n {{ i18n "sysadmin" }} @@ -46,7 +46,7 @@
- + {{ i18n {{ i18n "cio" }} @@ -54,7 +54,7 @@
- + {{ i18n {{ i18n "geek" }} diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 89031c7..d1865e0 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,10 +1,10 @@