From 548747b16e24df798e8a104f0f2f3a741f9512b2 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 25 Jul 2025 10:38:51 +0200 Subject: [PATCH] more typos Signed-off-by: Basil Bruhn --- services/gitea/gitea-faq.md | 22 +++++++++++----------- services/gitea/gitea-migration.md | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/gitea/gitea-faq.md b/services/gitea/gitea-faq.md index df3623ff..f97cc75c 100644 --- a/services/gitea/gitea-faq.md +++ b/services/gitea/gitea-faq.md @@ -13,7 +13,7 @@ If you are missing something here please contact [Gitea admins](mailto:gitea@psi ## I am confused about the login button situation -Since MFA is a hard requirement for all services that are exposed to the internet, we decided to only allow login with PSI MFA. This will reduce the amount of tokens you have to care for and we can offer you SSO from PSI (Not yet another token). If you have an active login / session with PSI MFA and your browser is allowed to use that token, you will be logged in automaticaly. +Since MFA is a hard requirement for all services that are exposed to the internet, we decided to only allow login with PSI MFA. This will reduce the amount of tokens you have to care for and we can offer you SSO from PSI (Not yet another token). If you have an active login / session with PSI MFA and your browser is allowed to use that token, you will be logged in automatically. ## Are there sub-organisations like subgroups in gitlab? No. Gitea like GitHub only supports a flat hierarchy. But there are several things you could do to organize yourself and your group. @@ -21,13 +21,13 @@ No. Gitea like GitHub only supports a flat hierarchy. But there are several thin As a side note: The GUI of a GIT service is used for a very limited set of work with code. You can organize the structure on your PC however you want! 1. Access specific organisations -- Create organizations according to the access priviledges. There is code you want to share with the world, have it in a public org. Want to have it shared with PSI, use an internal one. If its only for your team you can use a private org. +- Create organizations according to the access privileges. There is code you want to share with the world, have it in a public org. Want to have it shared with PSI, use an internal one. If its only for your team you can use a private org. 2. Simulate hierarchy - Create organisations and/or repositories with "sub" names separated by `-` or `_`. Examples: core-linux, os-linux, rhel-linux etc. 3. User visibility -- Usage of least privilege is always prefered. Keep the access and therefore visibility of repos as tight as needed to reduce the clutter for your users. +- Usage of least privilege is always preferred. Keep the access and therefore visibility of repos as tight as needed to reduce the clutter for your users. ### But I'm using GIT only with HTTPS! @@ -45,7 +45,7 @@ https://gitea.psi.ch/user/settings/applications ``` ### My LFS files are not tracked correctly -When you change the remote you have to re-push your LFS files explicedly. +When you change the remote you have to re-push your LFS files explicitly. ```bash git lfs push --all git@gitea.psi.ch:{org}/{repo}.git @@ -59,24 +59,24 @@ If you are missing a user and you are sure it has a PSI account, message the [Ac ## I need a service user/token for automation Since local login is disabled the user has to be created on the gitea console. Please contact the [Gitea admins](mailto:gitea@psi.ch) with your request. -The gitea token will then be mailed to you. If you are searching for the user in gitea gui it will be named {org}-gitea-bot +The gitea token will then be mailed to you. If you are searching for the user in gitea GUI it will be named {org}-gitea-bot - Username (usually org-gitea) - Scope the User needs access to (for example read:repository,write:packages) -- A valid E-Mail that is not registred yet in Gitea +- A valid E-Mail that is not registered yet in Gitea ### Challenges of using PAT on a external collaboration platform and its alternatives -User access tokens acting like a password to all ressources the user has access to. This can be dangerous. (The reason MFA login is enforced) +User access tokens acting like a password to all resources the user has access to. This can be dangerous. (The reason MFA login is enforced) Therefore we offer two alternatives: -1. Like described above, we can create bot users that have no access permissions besides the ones explicetly given. (To respect least privilege) +1. Like described above, we can create bot users that have no access permissions besides the ones explicitly given. (To respect least privilege) 2. Deployment of runners. Runners can be installed by the system owners and can be configured to execute precise actions with code from multiple repos that is not accessible to the user. We encourage teams to switch to deployments done by runners, as it goes along recent software engineering best practices. -3. Since the solutions above might not be feasable to you for reasons, there is the possiblity to map Teams (Permission groups inside Organisations) to AD Groups. A long established process at PSI is requesting access to certain AD group by a user with SNOW. (Service Now) This greatly reduces the manual labor done by development teams responisble for repo access. +3. Since the solutions above might not be feasible to you for reasons, there is the possibility to map Teams (Permission groups inside Organisations) to AD Groups. A long established process at PSI is requesting access to certain AD group by a user with SNOW. (Service Now) This greatly reduces the manual labor done by development teams responsible for repo access. This can be done by the Gitea [Gitea admins](mailto:gitea@psi.ch) @@ -104,7 +104,7 @@ Please use following commands to update your local git: 1. `git remote set-url origin https://gitea.psi.ch/{Org}/{Repo}.git` 2. `git remote set-url origin git@gitea.psi.ch:/{Org}/{Repo}.git` -Ask the responsible person for this Project, where the Repositoy has been moved to or you can browse Repos on https://gitea.psi.ch +Ask the responsible person for this Project, where the repository has been moved to or you can browse Repos on https://gitea.psi.ch More information about archived projects can be found here: - https://docs.gitlab.com/user/project/working_with_projects/#archive-a-project @@ -122,7 +122,7 @@ This is not production tested and needs a bit more love to fix all branches and ## Miscellanious ### I use Firefox and SSO does not work -Try adding following options to your firefox config. +Try adding following options to your firefox configuration. ```bash network.negotiate-auth.delegation-uris=.psi.ch diff --git a/services/gitea/gitea-migration.md b/services/gitea/gitea-migration.md index 9a058ad8..854b8bff 100644 --- a/services/gitea/gitea-migration.md +++ b/services/gitea/gitea-migration.md @@ -1,5 +1,5 @@ # Migration -If you want to migrate a project from another versioncontroll tool, the most frequently asked questions are agregated here. +If you want to migrate a project from another version control tool, the most frequently asked questions are aggregated here. ## I want to migrate a project from Gitlab / Github to Gitea @@ -15,7 +15,7 @@ In the top left corner you can click on "Explore" and then "Organizations" to se Optional: - Click the "+" in the top right of your screen and create an organization -- Authorization inside Organizations can be done via "Teams" - "New Team" and give the persmissions you need +- Authorization inside Organizations can be done via "Teams" - "New Team" and give the permissions you need - If you want to use AD Groups to authorize people in your Teams please contact [Gitea Project](mailto:gitea@psi.ch) Migration: