ansible/xoxys.droneci
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add github auth option
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2021-01-14 10:50:32 +01:00
parent 37b67eecac
commit a8939e3c83
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
defaults/main.yml
View File

@ -63,14 +63,24 @@ droneci_db_password: secure
droneci_db_ssl_mode: disable droneci_db_ssl_mode: disable
droneci_gitea_enabled: False # @var droneci_scm_provider:description: SCM provider to use with Drone (gitea|github)
droneci_scm_provider: none
## required gitea settings
droneci_gitea_server: http://my-git.example.com droneci_gitea_server: http://my-git.example.com
droneci_gitea_skip_verify: False droneci_gitea_skip_verify: False
# To enable gitea oauth set both # @var droneci_gitea_oauth_client_id:example: $ "1111-222-33333-44444"
# droneci_gitea_oauth_client_id: 1111-222-33333-44444 # defaults to not set # @var droneci_gitea_oauth_client_id: $ "_unset_"
# droneci_gitea_oauth_client_secret: 1234abcd5678efgh # defaults to not set
# @var droneci_gitea_oauth_client_secret:example: $ "1234abcd5678efgh"
# @var droneci_gitea_oauth_client_secret: $ "_unset_"
## required github settings
# @var droneci_github_client_id: $ "_unset_"
# @var droneci_github_client_secret: $ "_unset_"
droneci_user_filter: []
# @var droneci_admin_user: $ "_unset_" # @var droneci_admin_user: $ "_unset_"
# @var droneci_http_proxy: $ "_unset_" # @var droneci_http_proxy: $ "_unset_"
# @var droneci_https_proxy: $ "_unset_" # @var droneci_https_proxy: $ "_unset_"

10
templates/services/droneci_compose.yml.j2
View File

@ -38,6 +38,9 @@ services:
- DRONE_AGENTS_ENABLED=true - DRONE_AGENTS_ENABLED=true
- DRONE_RPC_SECRET={{ droneci_secret }} - DRONE_RPC_SECRET={{ droneci_secret }}
- DRONE_USER_CREATE=username:{{ droneci_admin_user }},admin:true - DRONE_USER_CREATE=username:{{ droneci_admin_user }},admin:true
{% if droneci_user_filter is defined and droneci_user_filter | length > 0 %}
- DRONE_USER_FILTER={{ droneci_user_filter | join(",") }}
{% endif %}
- DRONE_LOGS_COLOR=true - DRONE_LOGS_COLOR=true
- DRONE_LOGS_PRETTY=true - DRONE_LOGS_PRETTY=true
- DRONE_TLS_AUTOCERT=false - DRONE_TLS_AUTOCERT=false
@ -49,13 +52,14 @@ services:
- DRONE_DATABASE_DRIVER=postgres - DRONE_DATABASE_DRIVER=postgres
- DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_db_user }}:{{ droneci_db_password }}@{{ droneci_db_server }}/{{ droneci_db_name }}?sslmode={{ droneci_db_ssl_mode }} - DRONE_DATABASE_DATASOURCE=postgres://{{ droneci_db_user }}:{{ droneci_db_password }}@{{ droneci_db_server }}/{{ droneci_db_name }}?sslmode={{ droneci_db_ssl_mode }}
{% endif %} {% endif %}
{% if droneci_gitea_enabled %} {% if droneci_scm_provider | lower == "gitea" %}
- DRONE_GITEA_SERVER={{ droneci_gitea_server }} - DRONE_GITEA_SERVER={{ droneci_gitea_server }}
- DRONE_GITEA_SKIP_VERIFY={{ droneci_gitea_skip_verify | lower }} - DRONE_GITEA_SKIP_VERIFY={{ droneci_gitea_skip_verify | lower }}
{% if droneci_gitea_oauth_client_id is defined and droneci_gitea_oauth_client_secret is defined %}
- DRONE_GITEA_CLIENT_ID={{ droneci_gitea_oauth_client_id }} - DRONE_GITEA_CLIENT_ID={{ droneci_gitea_oauth_client_id }}
- DRONE_GITEA_CLIENT_SECRET={{ droneci_gitea_oauth_client_secret }} - DRONE_GITEA_CLIENT_SECRET={{ droneci_gitea_oauth_client_secret }}
{% endif %} {% elif droneci_scm_provider | lower == "github" %}
- DRONE_GITHUB_CLIENT_ID={{ droneci_github_client_id }}
- DRONE_GITHUB_CLIENT_SECRET={{ droneci_github_client_secret }}
{% endif %} {% endif %}
{% if droneci_http_proxy is defined %} {% if droneci_http_proxy is defined %}
- HTTP_PROXY={{ droneci_http_proxy | join(',') }} - HTTP_PROXY={{ droneci_http_proxy | join(',') }}