diff --git a/defaults/main.yml b/defaults/main.yml index a31563b..02cef3d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,15 +12,19 @@ drone_host_port: "8080" drone_github_server: "https://github.com" drone_github_client_id: "" drone_github_client_secret: "" +drone_github_debug: "false" drone_gitlab_server: "https://gitlab.com" drone_gitlab_client_id: "" drone_gitlab_client_secret: "" +drone_gitlab_skip_verify: "false" +drone_gitlab_debug: "false" drone_gitea_server: "" drone_gitea_client_id: "" drone_gitea_client_secret: "" drone_gitea_skip_verify: "false" +drone_gitea_debug: "false" drone_database_driver: "sqlite" drone_sqlite_dir: "/var/lib/drone" diff --git a/templates/drone-server.env.j2 b/templates/drone-server.env.j2 index fb90a08..55996d0 100644 --- a/templates/drone-server.env.j2 +++ b/templates/drone-server.env.j2 @@ -9,13 +9,6 @@ DRONE_TLS_AUTOCERT=false DRONE_RPC_SECRET={{ drone_rpc_secret }} {% endif %} DRONE_AGENTS_ENABLED=true -DRONE_GITHUB_SERVER=https://github.com -{% if drone_github_client_id is defined %} -DRONE_GITHUB_CLIENT_ID={{ drone_github_client_id }} -{% endif %} -{% if drone_github_client_secret is defined %} -DRONE_GITHUB_CLIENT_SECRET={{ drone_github_client_secret }} -{% endif %} {% if drone_logs_pretty is defined %} DRONE_LOGS_PRETTY={{ drone_logs_pretty }} {% endif %} @@ -30,6 +23,15 @@ DRONE_DATABASE_DRIVER={{ drone_database_driver }} DRONE_DATABASE_DATASOURCE={{ drone_database_datasource }} {% endif %} +DRONE_GITHUB_SERVER=https://github.com +{% if drone_github_client_id is defined %} +DRONE_GITHUB_CLIENT_ID={{ drone_github_client_id }} +{% endif %} +{% if drone_github_client_secret is defined %} +DRONE_GITHUB_CLIENT_SECRET={{ drone_github_client_secret }} +{% endif %} +DRONE_GITHUB_DEBUG={{ drone_github_debug }} + DRONE_GITLAB_SERVER=https://gitlab.com {% if drone_gitlab_client_id is defined %} DRONE_GITLAB_CLIENT_ID={{ drone_gitlab_client_id }} @@ -37,6 +39,7 @@ DRONE_GITLAB_CLIENT_ID={{ drone_gitlab_client_id }} {% if drone_gitlab_client_secret is defined %} DRONE_GITLAB_CLIENT_SECRET={{ drone_gitlab_client_secret }} {% endif %} +DRONE_GITLAB_DEBUG={{ drone_github_debug }} {% if drone_gitea_server is defined %} DRONE_GITEA_SERVER={{ drone_gitea_server }} @@ -50,3 +53,4 @@ DRONE_GITEA_CLIENT_SECRET={{ drone_gitea_client_secret }} {% if drone_gitea_skip_verify is defined %} DRONE_GITEA_SKIP_VERIFY={{ drone_gitea_skip_verify }} {% endif %} +DRONE_GITEA_DEBUG={{ drone_github_debug }}