[gitea] New release forces oauth2 on everyone
This commit is contained in:
parent
63facbde70
commit
1617061f51
|
@ -129,8 +129,8 @@ LOGIN_REMEMBER_DAYS = 30
|
||||||
MIN_PASSWORD_LENGTH = 10
|
MIN_PASSWORD_LENGTH = 10
|
||||||
IMPORT_LOCAL_PATHS = true
|
IMPORT_LOCAL_PATHS = true
|
||||||
DISABLE_GIT_HOOKS = true
|
DISABLE_GIT_HOOKS = true
|
||||||
SECRET_KEY = ${secret_key}
|
SECRET_KEY = "${secret_key}"
|
||||||
INTERNAL_TOKEN = ${internal_token}
|
INTERNAL_TOKEN = "${internal_token}"
|
||||||
|
|
||||||
[service]
|
[service]
|
||||||
; ; More detail: https://github.com/gogits/gogs/issues/165
|
; ; More detail: https://github.com/gogits/gogs/issues/165
|
||||||
|
@ -297,3 +297,8 @@ MIRROR = 300
|
||||||
CLONE = 300
|
CLONE = 300
|
||||||
PULL = 300
|
PULL = 300
|
||||||
GC = 60
|
GC = 60
|
||||||
|
|
||||||
|
[oauth2]
|
||||||
|
ENABLE = false
|
||||||
|
; this is same as JWT secret above
|
||||||
|
JWT_SECRET = "${oauth2-jwt-secret}"
|
||||||
|
|
|
@ -12,10 +12,11 @@ data "template_file" "gitea-config-file" {
|
||||||
template = "${file("${path.module}/conf/conf.ini.tpl")}"
|
template = "${file("${path.module}/conf/conf.ini.tpl")}"
|
||||||
|
|
||||||
vars {
|
vars {
|
||||||
secret_key = "${var.secret-key}"
|
secret_key = "${var.secret-key}"
|
||||||
internal_token = "${var.internal-token}"
|
internal_token = "${var.internal-token}"
|
||||||
smtp_password = "${var.smtp-password}"
|
smtp_password = "${var.smtp-password}"
|
||||||
lfs-jwt-secret = "${var.lfs-jwt-secret}"
|
lfs-jwt-secret = "${var.lfs-jwt-secret}"
|
||||||
mysql-password = "${var.mysql-password}"
|
mysql-password = "${var.mysql-password}"
|
||||||
|
oauth2-jwt-secret = "${var.oauth2-jwt-secret}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ variable "secret-key" {}
|
||||||
variable "internal-token" {}
|
variable "internal-token" {}
|
||||||
variable "smtp-password" {}
|
variable "smtp-password" {}
|
||||||
variable "lfs-jwt-secret" {}
|
variable "lfs-jwt-secret" {}
|
||||||
|
variable "oauth2-jwt-secret" {}
|
||||||
variable "mysql-password" {}
|
variable "mysql-password" {}
|
||||||
|
|
||||||
variable "traefik-network-id" {}
|
variable "traefik-network-id" {}
|
||||||
|
|
17
main.tf
17
main.tf
|
@ -34,14 +34,15 @@ module "timemachine" {
|
||||||
}
|
}
|
||||||
|
|
||||||
module "gitea" {
|
module "gitea" {
|
||||||
source = "gitea"
|
source = "gitea"
|
||||||
domain = "git.captnemo.in"
|
domain = "git.captnemo.in"
|
||||||
traefik-labels = "${var.traefik-common-labels}"
|
traefik-labels = "${var.traefik-common-labels}"
|
||||||
ips = "${var.ips}"
|
ips = "${var.ips}"
|
||||||
secret-key = "${data.pass_password.gitea-secret-key.password}"
|
secret-key = "${data.pass_password.gitea-secret-key.password}"
|
||||||
internal-token = "${data.pass_password.gitea-internal-token.password}"
|
internal-token = "${data.pass_password.gitea-internal-token.password}"
|
||||||
smtp-password = "${data.pass_password.gitea-smtp-password.password}"
|
smtp-password = "${data.pass_password.gitea-smtp-password.password}"
|
||||||
lfs-jwt-secret = "${data.pass_password.gitea-lfs-jwt-secret.password}"
|
lfs-jwt-secret = "${data.pass_password.gitea-lfs-jwt-secret.password}"
|
||||||
|
oauth2-jwt-secret = "${data.pass_password.gitea-oauth2-jwt-secret.password}"
|
||||||
|
|
||||||
//passed, but not used
|
//passed, but not used
|
||||||
mysql-password = ""
|
mysql-password = ""
|
||||||
|
|
|
@ -18,6 +18,10 @@ data "pass_password" "gitea-secret-key" {
|
||||||
path = "GITEA_SECRET_KEY"
|
path = "GITEA_SECRET_KEY"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data "pass_password" "gitea-oauth2-jwt-secret" {
|
||||||
|
path = "GITEA_OAUTH2_JWT_SECRET"
|
||||||
|
}
|
||||||
|
|
||||||
data "pass_password" "gf-security-admin-password" {
|
data "pass_password" "gf-security-admin-password" {
|
||||||
path = "GRAFANA_ADMIN_PASSWORD"
|
path = "GRAFANA_ADMIN_PASSWORD"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue