diff --git a/README.md b/README.md index b56bae1..eec965b 100644 --- a/README.md +++ b/README.md @@ -37,15 +37,15 @@ Build artifacts should be available in `./public/` This repository uses [Gna! Woodpecker-CI](https://woodpecker.gna.org/) to build and -[Gna/Pages](https://gitea.gna.org/Gna/pages) to deploy on each +[Gna/Pages](https://forgejo.gna.org/Gna/pages) to deploy on each commit. To setup the CI: * `ssh-keygen -b 4096 -f /tmp/pages` * `xclip -sel clip -in < /tmp/pages.pub` -* use that to add a key in https://gitea.gna.org/Gna/website/settings/keys (with write access) +* use that to add a key in https://forgejo.gna.org/Gna/website/settings/keys (with write access) * xclip -sel clip -in < /tmp/pages -* use that to add the hostea_write_deploy_key (see [.woodpecker.yml](https://gitea.gna.org/Gna/website/src/branch/master/.woodpecker.yml#L10)) in https://woodpecker.gna.org/Gna/website/settings#secrets +* use that to add the hostea_write_deploy_key (see [.woodpecker.yml](https://forgejo.gna.org/Gna/website/src/branch/master/.woodpecker.yml#L10)) in https://woodpecker.gna.org/Gna/website/settings#secrets * get the secret for pages in ~/.enough/gna.org/inventory/group_vars/pages-service-group.yml -* add secret for pages in https://woodpecker.gna.org/Gna/website/settings#secrets under the name **pages_deploy_secret** to match [.woodpecker.yml](https://gitea.gna.org/Gna/website/src/branch/master/.woodpecker.yml#L10) +* add secret for pages in https://woodpecker.gna.org/Gna/website/settings#secrets under the name **pages_deploy_secret** to match [.woodpecker.yml](https://forgejo.gna.org/Gna/website/src/branch/master/.woodpecker.yml#L10) diff --git a/content/about/index.md b/content/about/index.md index 6dc8c0c..9f187d1 100644 --- a/content/about/index.md +++ b/content/about/index.md @@ -3,16 +3,16 @@ title = "About" description = "About" +++ -Gna! provides [dedicated managed Gitea hosting](https://hosteadashboard.gna.org/dash/instance/new/), including [Woodpecker CI](https://woodpecker-ci.org/). Security updates are applied as soon as they are available and carefully tested. Each Gitea instance is monitored 24/7 and has backups. +Gna! provides [dedicated managed Forgejo hosting](https://hosteadashboard.gna.org/dash/instance/new/), including [Woodpecker CI](https://woodpecker-ci.org/). Security updates are applied as soon as they are available and carefully tested. Each Forgejo instance is monitored 24/7 and has backups. -You can rely on Gna! if you are an individual software developer who need their own Gitea instance with CI but can't be bothered with installation and maintenance. You want the freedom to download a backup and seamlessly self-host it whenever you decide: no strings attached. +You can rely on Gna! if you are an individual software developer who need their own Forgejo instance with CI but can't be bothered with installation and maintenance. You want the freedom to download a backup and seamlessly self-host it whenever you decide: no strings attached. -If you are into trouble and need assistance with a Gitea instance not hosted at Gna!, you [can ask for help at the Gna! clinic](/gitea-clinic/). The doctors have developped a unique expertise and are well equiped to help you recover and upgrade. +If you are into trouble and need assistance with a Forgejo instance not hosted at Gna!, you [can ask for help at the Gna! clinic](/forgejo-clinic/). The doctors have developped a unique expertise and are well equiped to help you recover and upgrade. --- -Do you already have an expertise running Gitea? You are welcome to join the [Gna! collective](https://forum.gna.org/t/57), get in touch [in the forum](https://forum.gna.org/c/site-feedback/2) or [the chat](https://matrix.to/#/#hostea:matrix.batsense.net). +Do you already have an expertise running Forgejo? You are welcome to join the [Gna! collective](https://forum.gna.org/t/57), get in touch [in the forum](https://forum.gna.org/c/site-feedback/2) or [the chat](https://matrix.to/#/#hostea:matrix.batsense.net). diff --git a/content/gitea-clinic/index.md b/content/forgejo-clinic/index.md similarity index 61% rename from content/gitea-clinic/index.md rename to content/forgejo-clinic/index.md index 708acfd..e6ffa22 100644 --- a/content/gitea-clinic/index.md +++ b/content/forgejo-clinic/index.md @@ -1,14 +1,14 @@ +++ -title = "Gitea Clinic" -description = "Get help with your sick Gitea instance" +title = "Forgejo Clinic" +description = "Get help with your sick Forgejo instance" +++ ## How does it work? -You can get help from the community on the [Gna! forum](https://forum.gna.org/c/clinic/5) or the [Gitea forum](https://discourse.gitea.io/): it is the best way to resolve simple issues. If you are in a hurry or the problem is serious you could: +You can get help from the community on the [Gna! forum](https://forum.gna.org/c/clinic/5) or the [Forgejo issue tracker](https://codeberg.org/forgejo/forgejo/): it is the best way to resolve simple issues. If you are in a hurry or the problem is serious you could: 1. Get in touch with the [doctor of your choice](#gna-doctors) -2. Upload your sick Gitea +2. Upload your sick Forgejo 3. Once it is repaired download it back home (or decide it deserves a permanent residence at [Gna!](https://gna.org)) 4. Pay the doctor @@ -17,4 +17,4 @@ You can get help from the community on the [Gna! forum](https://forum.gna.org/c/ All Gna! doctors charge a flat hourly rate for consultations held in public (sensitive information is never revealed, even if the consultation is held in public). Private consultations fees depend on the Gna! doctor. ## Gna! Doctors -{{ gitea_clinic_doc_reviews() }} +{{ forgejo_clinic_doc_reviews() }} diff --git a/content/tos/index.md b/content/tos/index.md index 513b078..dfc323d 100644 --- a/content/tos/index.md +++ b/content/tos/index.md @@ -17,11 +17,11 @@ Gna! hosts, via application software, content in private spaces that are not pub ## Support -Support requests should be filed as an issue in https://gitea.gna.org/Hostea/support/issues. +Support requests should be filed as an issue in https://forgejo.gna.org/Hostea/support/issues. -## Publicly available content published on Gitea instances +## Publicly available content published on Forgejo instances -All publicly available software published on the dedicated Gitea instances provided by Gna! must be published under a [Free Software license](https://www.gnu.org/licenses/license-list.html). +All publicly available software published on the dedicated Forgejo instances provided by Gna! must be published under a [Free Software license](https://www.gnu.org/licenses/license-list.html). ## Infrastructure diff --git a/data/clinic-doctors.toml b/data/clinic-doctors.toml index 4b74871..672ac19 100644 --- a/data/clinic-doctors.toml +++ b/data/clinic-doctors.toml @@ -3,7 +3,7 @@ [[ doctors ]] nick = "dachary" name ="Loïc Dachary" -website = "https://gitea.gna.org/dachary/hostea/issues" +website = "https://forgejo.gna.org/dachary/hostea/issues" picture = "/people/dachary.png" [[ doctors.reviews ]] @@ -17,7 +17,7 @@ remarks = "https://discourse.gitea.io/t/blank-page-after-login/5051/14" [[ doctors ]] nick = "realaravinth" name ="Aravinth Manivannan" -website = "https://gitea.gna.org/realaravinth/hostea/issues" +website = "https://forgejo.gna.org/realaravinth/hostea/issues" picture = "/people/realaravinth.jpg" [[ doctors.reviews ]] @@ -40,7 +40,7 @@ remarks = "Nice" [[ doctors ]] nick = "easter-eggs" name ="Easter-eggs" -website = "https://gitea.gna.org/easter-eggs/clinic/issues" +website = "https://forgejo.gna.org/easter-eggs/clinic/issues" picture = "/people/easter-eggs.png" diff --git a/docs/gitea-clinic-new-doctor.md b/docs/forgejo-clinic-new-doctor.md similarity index 94% rename from docs/gitea-clinic-new-doctor.md rename to docs/forgejo-clinic-new-doctor.md index 2b9743e..cdd2d7d 100644 --- a/docs/gitea-clinic-new-doctor.md +++ b/docs/forgejo-clinic-new-doctor.md @@ -1,4 +1,4 @@ -# Add new Gna! Doctor to Gitea Clinic section: +# Add new Gna! Doctor to Forgejo Clinic section: 1. Add the following template to [`clinic-doctors.toml`](../data/clinic-doctors.toml) and fill in the diff --git a/docs/gitea-clinic-rate-doctor.md b/docs/forgejo-clinic-rate-doctor.md similarity index 89% rename from docs/gitea-clinic-rate-doctor.md rename to docs/forgejo-clinic-rate-doctor.md index 83598d1..73ad3ba 100644 --- a/docs/gitea-clinic-rate-doctor.md +++ b/docs/forgejo-clinic-rate-doctor.md @@ -1,7 +1,7 @@ # Add ratings to Gna! Doctor 1. To rate Doctor `batman` from - [./gitea-clinic-new-doctor.md](./gitea-clinic-new-doctor.md) guide, + [./forgejo-clinic-new-doctor.md](./forgejo-clinic-new-doctor.md) guide, add the following section to `batman` section: ```toml diff --git a/sass/gitea-clinic/main.scss b/sass/forgejo-clinic/main.scss similarity index 100% rename from sass/gitea-clinic/main.scss rename to sass/forgejo-clinic/main.scss diff --git a/sass/gitea-clinic/mobile.scss b/sass/forgejo-clinic/mobile.scss similarity index 100% rename from sass/gitea-clinic/mobile.scss rename to sass/forgejo-clinic/mobile.scss diff --git a/sass/main.scss b/sass/main.scss index cb03f24..d1b3608 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -5,8 +5,7 @@ @import "./page/main"; @import "./blog/main"; @import "./tag/main"; -@import "./gitea-clinic/main"; - +@import "./forgejo-clinic/main"; .zola-anchor { margin-left: 5px; } diff --git a/sass/mobile.scss b/sass/mobile.scss index 88473fe..d8ddeaf 100644 --- a/sass/mobile.scss +++ b/sass/mobile.scss @@ -4,7 +4,7 @@ @import "./page/mobile"; @import "./blog/mobile"; @import "./tag/mobile"; -@import "./gitea-clinic/mobile.scss"; +@import "./forgejo-clinic/mobile.scss"; header { height: auto; diff --git a/scripts/ci.sh b/scripts/ci.sh index ba4afe1..e7d4ee2 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -39,7 +39,7 @@ Subcommands -c --clean cleanup secrets, SSH key and other runtime data -i --init initialize environment, write SSH private to file - -d --deploy push branch to Gitea and call Pages server + -d --deploy push branch to Forgejo and call Pages server -h --help print this help menu EOF } @@ -57,7 +57,7 @@ set_ssh_remote() { # repository_owner=$(echo $http_remote_url | cut -d '/' -f 4) # repository_name=$(echo $http_remote_url | cut -d '/' -f 5) # ssh_remote="git@$remote_hostname:$repository_owner/$repository_name" - ssh_remote="git@gitea.gna.org:Gna/website.git" + ssh_remote="git@forgejo.gna.org:Gna/website.git" git remote add $SSH_REMOTE_NAME $ssh_remote } diff --git a/templates/blog/index.html b/templates/blog/index.html index 437e2de..485782b 100644 --- a/templates/blog/index.html +++ b/templates/blog/index.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block meta %} {% set title = "Posts" %} -{% set description = "The Gna! Blog: we write about Gitea, Free Software and the general forge ecosystem" %} +{% set description = "The Gna! Blog: we write about Forgejo, Free Software and the general forge ecosystem" %} {{ macros::get_meta_tags(title=title, description=description) }} {% endblock meta %} {% block content %}

{{ section.title }}

-

Gna! is a Clinic to get help when a Gitea instance throws errors after an upgrade and the admin is not sure how to troubleshoot the problem. It opened in May 2022 and welcomes new patients. It will also provide dedicated Gitea hosting, including CI and more: subscribe to the blog or the Mastodon account to keep up to date.

+

Gna! is a Clinic to get help when a Forgejo instance throws errors after an upgrade and the admin is not sure how to troubleshoot the problem. It opened in May 2022 and welcomes new patients. It will also provide dedicated Forgejo hosting, including CI and more: subscribe to the blog or the Mastodon account to keep up to date.

    {% for page in section.pages %} diff --git a/templates/footer.html b/templates/footer.html index e8ac4fc..3758fdf 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -44,7 +44,7 @@ Privacy |

    - Gitea hosting and service. + Forgejo hosting and service.

    A free forge ecosystem for free developers.

      -
    • Dedicated Gitea hosting and Woodpecker CI from 10€/month
      • -
    • Clinic to heal sick Gitea instances
      • +
    • Dedicated Forgejo hosting and Woodpecker CI from 10€/month
      • +
    • Clinic to heal sick Forgejo instances
    • 100% Free Software
    • Radically Transparent
    • Run by a horizontal collective
      • diff --git a/templates/home/components/_features.html b/templates/home/components/_features.html index 5c2f27d..8c492c0 100644 --- a/templates/home/components/_features.html +++ b/templates/home/components/_features.html @@ -3,9 +3,9 @@
      -

      Gitea Hosting

      +

      Forgejo Hosting

      Run independent software forge

      -

      Dedicated Gitea hosting with Woodpecker, flat monthly price, unlimited bandwidth and users. All upgrades included. Fully self-hostable. ETA July 1st, 2022.

      +

      Dedicated Forgejo hosting with Woodpecker, flat monthly price, unlimited bandwidth and users. All upgrades included. Fully self-hostable. ETA July 1st, 2022.

      • Tested software releases
      • Infrastructure as Code Software
        • @@ -13,7 +13,7 @@
      • Payments manager included: become a service provider!
      diff --git a/templates/home/components/_services-new.html b/templates/home/components/_services-new.html index 3c35cc3..41a88eb 100644 --- a/templates/home/components/_services-new.html +++ b/templates/home/components/_services-new.html @@ -2,23 +2,23 @@
      -

      Gitea Clinic

      -

      Debug and Recover Self-Hosted Gitea Instances

      -

      Having issues upgrading your self-hosted Gitea? Upload it to Gna! and a doctor will help out. Once it feels better you can bring it home or decide it becomes a permanent resident.

      +

      Forgejo Clinic

      +

      Debug and Recover Self-Hosted Forgejo Instances

      +

      Having issues upgrading your self-hosted Forgejo? Upload it to Gna! and a doctor will help out. Once it feels better you can bring it home or decide it becomes a permanent resident.

        -
      • Consult Gitea experts
        • -
      • Upload your sick Gitea
        • +
      • Consult Forgejo experts
        • +
      • Upload your sick Forgejo
      • Once it gets better bring it back home
      • Optionally, decide it should get a permanent residence at Gna!
      @@ -34,16 +34,16 @@
      -

      Stuck with a broken Gitea instance? Talk to a Gna! Doctor!

      +

      Stuck with a broken Forgejo instance? Talk to a Gna! Doctor!

      diff --git a/templates/home/components/_services.html b/templates/home/components/_services.html index 9b72a82..f333bbc 100644 --- a/templates/home/components/_services.html +++ b/templates/home/components/_services.html @@ -1,8 +1,8 @@

      Services Offered

      - {{ card_macro::home_card(title="Gitea Hosting", description="Dedicated Gitea hosting with Woodpecker, flat monthly price, unlimited bandwidth and users. All upgrades included. Fully self-hostable. ETA July 1st, 2022.") }} - {{ card_macro::home_card(title="Gitea Clinic", description="Having issues upgrading your self-hosted Gitea? Upload it to Gna! and a doctor will help out. Once it feels better you can bring it home or decide it becomes a permanent resident.") }} - {{ card_macro::home_card(title="Towards Forge Federation 🚀", description="Gna! is leading the charge in implementing forge federation. It will be made available to all hosted Gitea instance as soon as it is available.") }} + {{ card_macro::home_card(title="Forgejo Hosting", description="Dedicated Forgejo hosting with Woodpecker, flat monthly price, unlimited bandwidth and users. All upgrades included. Fully self-hostable. ETA July 1st, 2022.") }} + {{ card_macro::home_card(title="Forgejo Clinic", description="Having issues upgrading your self-hosted Forgejo? Upload it to Gna! and a doctor will help out. Once it feels better you can bring it home or decide it becomes a permanent resident.") }} + {{ card_macro::home_card(title="Towards Forge Federation 🚀", description="Gna! is leading the charge in implementing forge federation. It will be made available to all hosted Forgejo instance as soon as it is available.") }}
      diff --git a/templates/index.html b/templates/index.html index 83f4c2e..387742b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,7 +3,7 @@ {% import "home/components/home-card-new.html" as card_macro2 %} {% extends "base.html" %} {% block meta %} -{% set description = "Gna!: Dedicated managed Gitea hosting, including CI/CD +{% set description = "Gna!: Dedicated managed Forgejo hosting, including CI/CD and static pages with upgrades, backups and 24/7 monitoring" %} {% set title = "Home" %} {{ macros::get_meta_tags(title=title, description=description) }} {% endblock meta %} {% block content %} diff --git a/templates/macros.html b/templates/macros.html index df6b7a2..7aacee0 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -49,7 +49,7 @@ {% macro get_meta_tags(title, description) %} - {% set title = title ~ " | Gna!: Managed Gitea Hosting " %} + {% set title = title ~ " | Gna!: Managed Forgejo Hosting " %} diff --git a/templates/shortcodes/gitea_clinic_doc_reviews.html b/templates/shortcodes/forgejo_clinic_doc_reviews.html similarity index 100% rename from templates/shortcodes/gitea_clinic_doc_reviews.html rename to templates/shortcodes/forgejo_clinic_doc_reviews.html