updated sync with info_grid

collections/system_administrators/computer_it_basics/computer_it_basics.md

@@ -9,8 +9,7 @@ In this section, tailored specifically for system administrators, we'll delve in
 - [CLI and Scripts Basics](cli_scripts_basics.md)
 - [Docker Basics](docker_basics.md)
 - [Git and GitHub Basics](git_github_basics.md)
+- [Gitea](gitea_toc.md)
 - [Firewall Basics](firewall_basics.md)
-  - [UFW Basics](ufw_basics.md)
-  - [Firewalld Basics](firewalld_basics.md)
 - [File Transfer](file_transfer.md)
 - [Screenshots](screenshots.md)

collections/system_administrators/computer_it_basics/gitea/gitea_api.md

@@ -0,0 +1,98 @@
+<h1>Gitea API</h1>
+
+<h2>Table of Contents</h2>
+
+- [Introduction](#introduction)
+- [Swagger](#swagger)
+- [CLI](#cli)
+- [Swagger and CLI](#swagger-and-cli)
+- [API Authorization](#api-authorization)
+- [References](#references)
+
+---
+
+## Introduction
+
+We show how to use the Gitea API with both Swagger and CLI.
+
+## Swagger
+
+The Gitea API is available with the slugs `/api/swagger#` after your Gitea domain URL.
+
+- For ThreeFold, we use the following Gitea API:
+```
+https://git.ourworld.tf/api/swagger#/
+```
+
+You can access different levels of the Gitea instance:
+
+![](./img/api_overview.png)
+
+You can use the Swagger for different queries. Parameters are expained for each example so it is a fairly intuitive use.
+
+For example, to get the raw content of a file, you can use the following:
+
+- Go to the section `Get a file from a repository`.
+
+- In this example, we query the tfgrid organization and its repository `info_tfgrid` for the branch `main`. We write the path of the file.
+
+![](./img/api_example_file.png)
+
+Once you tried a query on the API, you can take the curl command example to query the same information from the CLI. We check this in the next section.
+
+## CLI
+
+To use the API with a command line interface, you can use curl.
+
+For example, we take the raw content of a file:
+
+```
+curl -X 'GET' \
+  'https://git.ourworld.tf/api/v1/repos/tfgrid/info_tfgrid/raw/heroscript%2Fduniayetu%2Fbook_collections.md?ref=main' \
+  -H 'accept: application/json'
+```
+
+We can save this in a file by adding `> filename.txt` after the line above:
+
+```
+curl -X 'GET' \
+  'https://git.ourworld.tf/api/v1/repos/tfgrid/info_tfgrid/raw/heroscript%2Fduniayetu%2Fbook_collections.md?ref=main' \
+  -H 'accept: application/json' > filename.txt
+```
+
+## Swagger and CLI
+
+A combination of the Swagger and the CLI can be very effective.
+
+First, find the proper `curl` command by using the Gitea Swagger, then use the CLI to pass the `curl` commands.
+
+## API Authorization
+
+If you want to query information that is access-protected, such as a private repository, you first need to create a Gitea access token and then log into the Gitea API with the token.
+
+Once this is done, every Swagger request you ask will be accompanied with the access token.
+
+- Create an access token directly on Gitea
+  - Go to the `Applications` section of the `User Settings` [on Gitea](https://git.ourworld.tf/user/settings/applications)
+  - Under `Manage Access Tokens`, choose a `Token Name`
+  - Select either ̀`Public only` or `All (public, private and limited)`. For private access, choose the latter
+  - You must select at least one permission to create a token. Click on `Select permissions` and choose the permissions for your token
+  - Click on `Generate token`
+  - Copy the generate token and keep it somewhere safe
+
+![](./img/gitea_token.png)
+
+- Log in the Gitea API with your access token
+  - On the top of the Gitea API page, click on `Authorize`
+
+<p align="center">
+  <img src="./img/gitea_authorize_token.png" />
+</p>
+
+  - In `AuthorizationHeaderToken (apiKey)` write `token` followed by a space and then paste your token, e.g.:
+    - `token 1234567890`
+- Once you're logged in with your token, you can make queries with the API
+
+## References
+
+You can learn more by reading the [Gitea API documentation](https://docs.gitea.com/development/api-usage).

collections/system_administrators/computer_it_basics/gitea/gitea_basics.md

@@ -0,0 +1,194 @@
+<h1>Gitea Basics</h1>
+
+<h2>Table of Contents</h2>
+
+- [Introduction](#introduction)
+- [Prerequisites](#prerequisites)
+- [Register](#register)
+- [Sign In](#sign-in)
+- [Set an SSH Key Pair](#set-an-ssh-key-pair)
+- [Start the SSH Agent](#start-the-ssh-agent)
+- [Clone a Repository](#clone-a-repository)
+- [Create and Push a New Branch](#create-and-push-a-new-branch)
+  - [On the Browser and Git](#on-the-browser-and-git)
+  - [Only With Git](#only-with-git)
+- [Create a Pull Request](#create-a-pull-request)
+  - [Create a Draft Pull Request](#create-a-draft-pull-request)
+- [Useful Commands](#useful-commands)
+- [Gitea References](#gitea-references)
+
+---
+
+## Introduction
+
+We present a basic guide for Gitea, a forge software package for hosting software development version control using Git as well as other collaborative features like bug tracking, code review, continuous integration, kanban boards, tickets, and wikis.
+
+ThreeFold hosts its own git server on [Gitea OurWorld](https://git.ourworld.tf). We will be using OurWorld's Gitea instance for this guide.
+
+## Prerequisites
+
+You should have git installed on your computer to work easily with Gitea. It is not necessary to use Gitea but recommended to work with files.
+
+- Install [git](../git_github_basics.md#install-git)
+  - Optional, to update repositories from your local computer
+- Install [VSCodium](../git_github_basics.md#vs-codium)
+  - Optional, to edit your files
+- Install [OpenSSH](../../getstarted/ssh_guide/ssh_openssh.md)
+  - Optional, to use SSH
+
+## Register
+
+- Go to the main gitea URL, e.g. [https://git.ourworld.tf](https://git.ourworld.tf)
+- On the top right click on `Register`
+- Set your credentials
+  - Enter a `Username`
+  - Enter your `Email Address`
+  - Enter and confirm a `Password`
+- Click on `Register Account`
+
+![](./img/gitea_register.png)
+
+## Sign In
+
+- Go to the main Gitea URL, e.g. [https://git.ourworld.tf](https://git.ourworld.tf)
+- On the top right click on `Sign In`
+- Set your credentials
+  - Enter your `Username` or your `Email Address`
+  - Enter your `Password`
+- Click on `Sign In`
+
+![](./img/gitea_sign_in.png)
+
+## Set an SSH Key Pair
+
+- Generate an SSH key pair. You can leave default option `~/.ssh/id_rsa.pub`
+```
+ssh-keygen
+```
+- Note the public key
+```
+cat ~/.ssh/id_rsa.pub
+```
+- [Add the SSH public key on git.ourworld.tf](https://git.ourworld.tf/user/settings/keys)
+  - Click on `Add Key` on the top right
+  - Paste the public key in `Content`
+  - The `Key Name` will be added automatically
+  - Click on `Add key` under `Content`
+
+![](./img/gitea_ssh_key.png)
+
+- Optional: on git.ourworld.tf, verify the key. Make sure to put the proper token.
+```
+echo -n 'token' | ssh-keygen -Y sign -n gitea -f ~/.ssh/id_rsa
+```
+
+## Start the SSH Agent
+
+- Start the ssh agent
+```
+eval $(ssh-agent)
+```
+- Add private key to the agent
+```
+ssh-add ~/.ssh/id_rsa.pub
+```
+
+## Clone a Repository
+
+- Clone a repository and change directory
+```
+git clone <repository_url>
+cd <repository_url>
+```
+
+## Create and Push a New Branch
+
+### On the Browser and Git
+
+- On the repo of the Gitea instance, click on the ̀`Branch` icon (e.g. `development`)
+- Write a branch name with the `development_branch_name` convention
+- Click `Create branch`
+
+![](./img/gitea_new_branch.png)
+
+```
+git checkout development
+git fetch
+git pull
+```
+- Make changes in the files
+- When changes are done, make a new branch, add the new files, commit and push to the remote server
+```
+git add .
+git commit -m "Commit message for new branch"
+git push
+```
+
+### Only With Git
+
+- Start by working on the latest development release
+```
+git checkout development
+git fetch
+git pull
+```
+- Make changes in the files
+- When changes are done, make a new branch, add the new files, commit and push to the remote server
+```
+git checkout -b development_new_branch
+git add .
+git commit -m "Commit message for new branch"
+git push --set-upstream origin development_new_branch
+```
+
+## Create a Pull Request
+
+- Go to the repo of the Gitea instance
+- Click on `Pull Request` then `New Pull Request`
+
+![](./img/gitea_new_pr.png)
+
+- Choose the branch you want to merge into development for `pull from` then click `New Pull Request`
+  - At ThreeFold, we protect the master/main and development branches and always make Pull Request from `development_branch_name` to `development`
+
+![](./img/gitea_pr_create.png)
+
+- On the next page, choose a `Title` and a `Description`, then click `Create Pull Request`
+  - Usually, we write at least any related issue and a brief description of the work done
+
+![](./img/gitea_pr_title_description.png)
+
+- At any time you can close your own Pull Request
+
+![](./img/gitea_close_pr.png)
+
+### Create a Draft Pull Request
+
+To create a draft pull request, you simply need to add `WIP:` before the title of your pull request. This will set the pull request in Draft mode.
+
+- Example of a draft pull request:
+```
+WIP: New Pull Request in Draft Mode
+```
+
+## Useful Commands
+
+- See current branch
+```
+git branch
+```
+- See all branches locally
+```
+git branch -r
+```
+- See the git status
+```
+git status
+```
+
+## Gitea References
+
+There are great Gitea references available online.
+
+- [Gitea Docs](https://docs.gitea.com/)
+- [Gitea Cheat Sheet](https://docs.gitea.com/administration/config-cheat-sheet)

collections/system_administrators/computer_it_basics/gitea/gitea_toc.md

@@ -0,0 +1,6 @@
+# Gitea
+
+## Table of Contents
+
+- [Gitea Basics](./gitea_basics.md)
+- [Gitea API](./gitea_api.md)