From 1caecddf18f3c399e114aa0687d888dd3626de8f Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 25 Dec 2023 20:35:53 +0100 Subject: [PATCH] {developer,user}: next.forgejo.org: update with the new location --- docs/developer/infrastructure.md | 1 + docs/developer/next-forgejo-org.md | 35 +++--------------------------- docs/user/forgejo-next.md | 19 +--------------- 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/docs/developer/infrastructure.md b/docs/developer/infrastructure.md index 6392604e..edf6cfe4 100644 --- a/docs/developer/infrastructure.md +++ b/docs/developer/infrastructure.md @@ -288,6 +288,7 @@ It hosts LXC containers setup with [lxc-helpers](https://code.forgejo.org/forgej - upgrades checklist: ```sh docker stop forgejo + docker rm forgejo docker rmi codeberg.org/forgejo-experimental/forgejo:1.22.0-test docker pull codeberg.org/forgejo-experimental/forgejo:1.22.0-test bash -x /home/debian/run-forgejo.sh diff --git a/docs/developer/next-forgejo-org.md b/docs/developer/next-forgejo-org.md index 2faec744..272a1c1b 100644 --- a/docs/developer/next-forgejo-org.md +++ b/docs/developer/next-forgejo-org.md @@ -17,37 +17,8 @@ Typically, the instance will be running a recent build straight from the included in the next major version of Forgejo. When a release branch is created and release candidates are posted, Forgejo Next will be switched to the latest release candidate. Release candidates are to be deployed -until a stable release is available, at which point the stable release -will be deployed. After the release has been sufficiently tested (often -after it's deployed to Codeberg), next.forgejo.org will then be upgraded +until a stable release is available. next.forgejo.org will then be upgraded back to the `forgejo` branch. -next.forgejo.org is generously hosted by Codeberg to help the Forgejo -community test and demonstrate its product. The instance runs inside -its own LXC container on Codeberg's infrastructure. When SNI-enabled -traffic bound for next.forgejo.org reaches Codeberg's proxy on port 443, -the raw TCP traffic is forwarded to the container, allowing the instance -to terminate the SSL/TLS and obtain its own certificate using Forgejo's -inbuilt ACME client. The proxy also forwards port 2222 to the container -for SSH access. Additionally, Codeberg provides a database on their -existing MariaDB host for the instance to use. - -Inside the container, the Forgejo binary is manually installed to -`/usr/local/bin/forgejo` with the service managed by systemd. -Configuration is loaded from `/etc/forgejo/app.ini`. -_TODO: Semi-automated deployment with Forgejo Actions._ - -Since the container is inside Codeberg's infrastructure, logging into -it for maintainence is subject to Codeberg's security policy. If you -need to access it, please -[seek approval from the Forgejo community](https://codeberg.org/forgejo/governance/issues), -then contact Codeberg staff for more information. - - - -When working with the container, it's important to avoid breaking anything -in a way that will cause any user data to be lost. Users of next.forgejo.org -are expected to keep their own backups of any important data they upload, -but we also wish to encourage casual use of the instance for legitimate -projects, not just test repos, so the instance should _not_ be considered -disposable. +For details on the hardward from which it is running, [checkout the section in the +infrastructe documentation](../infrastructure/#containers). diff --git a/docs/user/forgejo-next.md b/docs/user/forgejo-next.md index a06c31b8..1c31ca5a 100644 --- a/docs/user/forgejo-next.md +++ b/docs/user/forgejo-next.md @@ -8,24 +8,7 @@ official testing and demonstration instance. Everyone is encouraged to use it to experiment with Forgejo, try out upcoming features, search for bugs, or even casually host a project. -Internal registration is currently not allowed, but you may create an -account on Forgejo Next by logging in with any of the supported external -authentication providers. Currently supported providers are -Codeberg.org, GitHub.com, GitLab.com, Gitea.com, and try.gitea.io. -After creating your account, you can set a password for local -authentication on next.forgejo.org. - Please make sure you have a mirror or backup of any important data uploaded -to Forgejo Next! We try to avoid breaking things, but this instance is +to Forgejo Next! It won't be reset unless there is a need to, but this instance is running potentially unstable code, so don't use it as your only storage for irreplacable valuable data. - -The Forgejo Next service is a collaborative effort. Provided by Codeberg -and managed by the Forgejo community, a selection of Forgejo contributors -have administrative access to the instance and all user data in addition -to Codeberg's administrators. Please do not use private repositories on -Forgejo Next to store highly sensitive secrets. - - - -