coop-cloud/gitea
coop-cloud
/
gitea
4
1
Fork 4
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Adding Oauth2 options and up on versions #29

Merged
decentral1se merged 7 commits from :master into master 2022-11-13 21:54:02 +00:00
Conversation 2 Commits 7 Files Changed 4 +27 -4
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.sample
View File

@ -31,3 +31,11 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
# GITEA_SMTP_MAILER_ENABLED=1
# GITEA_MAILER_HOST=mail.gandi.net:465
# SECRET_SMTP_PASSWORD_VERSION=v1
# OATH2 Options
decentral1se marked this conversation as resolved
decentral1se commented 2022-11-11 16:38:44 +00:00
Review
Copy Link

Missing GITEA_OAUTH2_CLIENT_ENABLED?

Missing `GITEA_OAUTH2_CLIENT_ENABLED`?
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
# GITEA_OAUTH2_USERNAME=replace-me
# GITEA_UPDATE_AVATAR=replace-me
# GITEA_ACCOUNT_LINKING=replace-me
# GITEA_OAUTH2_CLIENT_ENABLED=replace-me

2
abra.sh
View File

@ -1,4 +1,4 @@
export APP_INI_VERSION=v8
export APP_INI_VERSION=v9
export DOCKER_SETUP_SH_VERSION=v1
abra_backup_app() {

9
app.ini.tmpl
View File

@ -57,6 +57,15 @@ MAILER_TYPE = smtp
IS_TLS_ENABLED = true
{{ end }}
{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
[oauth2_client]
REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }}
ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }}
USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }}
UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }}
ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }}
{{ end }}
[markup.restructuredtext]
ENABLED = true
FILE_EXTENSIONS = .rst

12
compose.yml
View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "gitea/gitea:1.17.2-rootless"
image: "gitea/gitea:1.17.3-rootless"
configs:
- source: app_ini
target: /etc/gitea/app.ini
@ -32,6 +32,12 @@ services:
- GITEA_SSH_PORT
- GITEA_DISABLE_GRAVATAR
- GITEA_ENABLE_FEDERATED_AVATAR
- GITEA_REGISTER_EMAIL_CONFIRM
decentral1se marked this conversation as resolved
decentral1se commented 2022-11-11 16:39:06 +00:00
Review
Copy Link

Missing GITEA_OAUTH2_CLIENT_ENABLED also?

Missing `GITEA_OAUTH2_CLIENT_ENABLED` also?
- GITEA_ENABLE_AUTO_REGISTRATION
- GITEA_OAUTH2_USERNAME
- GITEA_UPDATE_AVATAR
- GITEA_ACCOUNT_LINKING
- GITEA_OAUTH2_CLIENT_ENABLED
volumes:
- data:/var/lib/gitea
- config:/etc/gitea
@ -53,10 +59,10 @@ services:
- "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
- "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
- "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
- coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless
- coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless
decentral1se marked this conversation as resolved Outdated
decentral1se commented 2022-11-12 16:35:52 +00:00
Outdated
Review
Copy Link

@javielico Ah, woops, sorry. I just realised, the version also needs to be bumped here too?

@javielico Ah, woops, sorry. I just realised, the version also needs to be bumped here too?
👍 1
javielico commented 2022-11-13 00:46:12 +00:00
Outdated
Review
Copy Link

All done in the new commit, apologies for the oversight!

All done in the new commit, apologies for the oversight!
❤️ 1
db:
image: "mariadb:10.6"
image: "mariadb:10.9"
command: |
mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment: