diff --git a/roles/authelia-for-forgejo/info.md b/roles/authelia-for-forgejo/info.md index bca0fd8..14a539f 100644 --- a/roles/authelia-for-forgejo/info.md +++ b/roles/authelia-for-forgejo/info.md @@ -1,9 +1,9 @@ ## Beschreibung -Um [Gitea](../forgejo) gegen [Authelia](../authelia) authentifizieren zu lassen +Um [Forgejo](../forgejo) gegen [Authelia](../authelia) authentifizieren zu lassen ## Verweise -- [Gitea-Dokumentation | Configuration | OpenID](https://docs.forgejo.com/administration/config-cheat-sheet#openid-openid) -- [Authelia-Dokumentation | Gitea Integration](https://www.authelia.com/integration/openid-connect/forgejo/) +- [Forgejo-Dokumentation | Configuration | OpenID](https://forgejo.org/docs/latest/admin/config-cheat-sheet/#openid-openid) +- [Authelia-Dokumentation | Gitea Integration](https://www.authelia.com/integration/openid-connect/gitea/) diff --git a/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2 b/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2 index 568b00d..3f0e1c7 100644 --- a/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2 +++ b/roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2 @@ -1,7 +1,7 @@ { "client_id": "{{var_authelia_for_forgejo_client_id}}", "client_secret": "{{var_authelia_for_forgejo_client_secret}}", - "client_name": "Gitea", + "client_name": "Forgejo", "public": false, "authorization_policy": "one_factor", "redirect_uris": [ diff --git a/roles/forgejo-and-nginx/info.md b/roles/forgejo-and-nginx/info.md index 2bc25e2..8b13789 100644 --- a/roles/forgejo-and-nginx/info.md +++ b/roles/forgejo-and-nginx/info.md @@ -1,3 +1 @@ -## Verweise -- [Gitea-Dokumentation](https://docs.forgejo.com/next/administration/reverse-proxies#nginx) diff --git a/roles/forgejo/defaults/main.json b/roles/forgejo/defaults/main.json index abdd897..570046a 100644 --- a/roles/forgejo/defaults/main.json +++ b/roles/forgejo/defaults/main.json @@ -1,7 +1,7 @@ { "var_forgejo_user": "forgejo", "var_forgejo_directory": "/opt/forgejo", - "var_forgejo_version": "1.22.1", + "var_forgejo_version": "7.0.5", "var_forgejo_platform": "linux-amd64", "var_forgejo_secret_key": "REPLACE_ME", "var_forgejo_internal_token": "REPLACE_ME", diff --git a/roles/forgejo/info.md b/roles/forgejo/info.md index 08cbb20..db535da 100644 --- a/roles/forgejo/info.md +++ b/roles/forgejo/info.md @@ -1,13 +1,12 @@ ## Beschreibung -Zur Einrichtung der DevOps-Platform [Gitea](https://about.forgejo.com/) +Zur Einrichtung der DevOps-Platform [Forgejo](https://forgejo.org/) ## Verweise -- [Gitea Homepage | self hosting](https://about.forgejo.com/products/forgejo/) -- [Gitea Documentation | Installation from binary](https://docs.forgejo.com/installation/install-from-binary) -- [Gitea Documentation | Config Cheat Sheet](https://docs.forgejo.com/administration/config-cheat-sheet) +- [Forgejo | Documentation | Administrator Guide](https://forgejo.org/docs/latest/admin/) +- [Forgejo | Documentation | Configuration Cheat Sheet](https://forgejo.org/docs/latest/admin/config-cheat-sheet/) ## ToDo diff --git a/roles/forgejo/tasks/main.json b/roles/forgejo/tasks/main.json index d55c8c0..5f36530 100644 --- a/roles/forgejo/tasks/main.json +++ b/roles/forgejo/tasks/main.json @@ -46,7 +46,7 @@ "become": true, "become_user": "{{var_forgejo_user}}", "ansible.builtin.get_url": { - "url": "https://dl.forgejo.com/forgejo/{{var_forgejo_version}}/forgejo-{{var_forgejo_version}}-{{var_forgejo_platform}}", + "url": "https://codeberg.org/forgejo/forgejo/releases/download/v{{var_forgejo_version}}/forgejo-{{var_forgejo_version}}-{{var_forgejo_platform}}", "dest": "{{var_forgejo_directory}}/forgejo", "mode": "u+rx" } diff --git a/roles/forgejo/templates/config.ini.j2 b/roles/forgejo/templates/config.ini.j2 index d68d654..e12c714 100644 --- a/roles/forgejo/templates/config.ini.j2 +++ b/roles/forgejo/templates/config.ini.j2 @@ -1,4 +1,4 @@ -APP_NAME = Gitea: Git with a cup of tea +APP_NAME = Forgejo: Beyond coding. We Forge. RUN_USER = {{var_forgejo_user}} RUN_MODE = prod diff --git a/roles/forgejo/templates/systemd-unit.j2 b/roles/forgejo/templates/systemd-unit.j2 index 3a5af02..f9b3c29 100644 --- a/roles/forgejo/templates/systemd-unit.j2 +++ b/roles/forgejo/templates/systemd-unit.j2 @@ -1,5 +1,5 @@ [Unit] -Description=Gitea (Git with a cup of tea) +Description=Forgejo After=network.target {% if var_forgejo_database_kind == 'postgresql' %} Wants=postgresql.service @@ -14,7 +14,7 @@ Group={{var_forgejo_user}} WorkingDirectory={{var_forgejo_directory}} ExecStart={{var_forgejo_directory}}/forgejo web --config {{var_forgejo_directory}}/custom/conf/app.ini Restart=always -# Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/forgejo +# Environment=USER=git HOME=/home/git FORGEJO_WORK_DIR=/var/lib/forgejo # Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin [Install]