From 566db7ed84a49a42b5e75b984598ebf99050ad0c Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Wed, 27 Mar 2024 18:08:02 -0400 Subject: [PATCH] fix yammllint warning and random space from weird line wrapping --- .yamllint | 2 +- group_vars/hatecomputers-club.yml | 9 +++++++++ .../hatecomputers-club/templates/docker-compose.yml.j2 | 7 +++++++ secrets.txt | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 group_vars/hatecomputers-club.yml diff --git a/.yamllint b/.yamllint index 0dea0aa..8b6f6ec 100644 --- a/.yamllint +++ b/.yamllint @@ -24,7 +24,7 @@ rules: indentation: enable key-duplicates: enable key-ordering: disable - line-length: enable + line-length: disable new-line-at-end-of-file: enable new-lines: enable octal-values: disable diff --git a/group_vars/hatecomputers-club.yml b/group_vars/hatecomputers-club.yml new file mode 100644 index 0000000..ab618b3 --- /dev/null +++ b/group_vars/hatecomputers-club.yml @@ -0,0 +1,9 @@ +--- + +hatecomputers_club_oauth2_scope: "openid,email,profile" +hatecomputers_club_oauth2_auth_url: "https://auth.hatecomputers.club/ui/oauth2" +hatecomputers_club_oauth2_token_url: > + https://auth.hatecomputers.club/oauth2/token +hatecomputers_club_oauth2_user_info_uri: > + https://auth.hatecomputers.club/oauth2/openid/{{ hatecomputers_club_oauth2_client_id }}/userinfo +hatecomputers_club_oauth2_redirect_uri: "https://hatecomputers.club/auth" diff --git a/playbooks/roles/hatecomputers-club/templates/docker-compose.yml.j2 b/playbooks/roles/hatecomputers-club/templates/docker-compose.yml.j2 index 8355895..22aa65e 100644 --- a/playbooks/roles/hatecomputers-club/templates/docker-compose.yml.j2 +++ b/playbooks/roles/hatecomputers-club/templates/docker-compose.yml.j2 @@ -10,5 +10,12 @@ services: environment: - CLOUDFLARE_TOKEN={{ cloudflare_api_token }} - CLOUDFLARE_ZONE={{ cloudflare_zone_id }} + - OAUTH_SCOPES={{ hatecomputers_club_oauth2_scope }} + - OAUTH_AUTH_URL={{ hatecomputers_club_oauth2_auth_url }} + - OAUTH_TOKEN_URL={{ hatecomputers_club_oauth2_token_url }} + - OAUTH_CLIENT_ID={{ hatecomputers_club_oauth2_client_id }} + - OAUTH_CLIENT_SECRET={{ hatecomputers_club_oauth2_client_secret }} + - OAUTH_REDIRECT_URI={{ hatecomputers_club_oauth2_redirect_uri }} + - OAUTH_USER_INFO_URI={{ hatecomputers_club_oauth2_user_info_uri }} volumes: - ./db:/app/db diff --git a/secrets.txt b/secrets.txt index 0c84a66..f09cced 100644 --- a/secrets.txt +++ b/secrets.txt @@ -10,3 +10,5 @@ gitea_internal_token drone_gitea_client_id drone_gitea_client_secret drone_rpc_secret +hatecomputers_club_oauth2_client_id +hatecomputers_club_oauth2_client_secret