diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main.yml index 90cd0da..7d48c99 100644 --- a/roles/forgejo/defaults/main.yml +++ b/roles/forgejo/defaults/main.yml @@ -29,3 +29,6 @@ forgejo_use_ci: false # forgejo_ci_gitlab_secret: # forgejo_ci_forgejo_client: # forgejo_ci_forgejo_secret: +# forgejo_ci_gitea_url: +# forgejo_ci_gitea_client: +# forgejo_ci_gitea_secret: diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2 index 5352930..4448c3b 100644 --- a/roles/forgejo/templates/docker-stack.yml.j2 +++ b/roles/forgejo/templates/docker-stack.yml.j2 @@ -81,8 +81,8 @@ services: {% endif %} {% if forgejo_ci_gitlab_client is not undefined and not None and forgejo_ci_gitlab_secret is not undefined and not None %} - WOODPECKER_GITLAB=true - - WOODPECKER_gitlab_CLIENT={{ forgejo_ci_gitlab_client }} - - WOODPECKER_gitlab_SECRET={{ forgejo_ci_gitlab_secret }} + - WOODPECKER_GITLAB_CLIENT={{ forgejo_ci_gitlab_client }} + - WOODPECKER_GITLAB_SECRET={{ forgejo_ci_gitlab_secret }} {% endif %} {% if forgejo_ci_forgejo_client is not undefined and not None and forgejo_ci_forgejo_secret is not undefined and not None %} - WOODPECKER_FORGEJO=true @@ -90,6 +90,12 @@ services: - WOODPECKER_FORGEJO_CLIENT={{ forgejo_ci_forgejo_client }} - WOODPECKER_FORGEJO_SECRET={{ forgejo_ci_forgejo_secret }} {% endif %} +{% if forgejo_ci_gitea_url is not undefined and not None and forgejo_ci_gitea_client is not undefined and not None and forgejo_ci_gitea_secret is not undefined and not None %} + - WOODPECKER_GITEA=true + - "WOODPECKER_GITEA_URL={{ (forgejo_use_https == True) | ternary('https', 'http') }}://{{ (subdomain_alias is not undefined and not none) | ternary(subdomain_alias, stack_name) }}.{{server_domain}}" + - WOODPECKER_GITEA_CLIENT={{ forgejo_ci_gitea_client }} + - WOODPECKER_GITEA_SECRET={{ forgejo_ci_gitea_secret }} +{% endif %} wp-agent: image: woodpeckerci/woodpecker-agent:latest