diff --git a/inventory/ghp/sample/group_vars/all/versions.yaml b/inventory/ghp/sample/group_vars/all/versions.yaml index 7a1a0f6..5568847 100644 --- a/inventory/ghp/sample/group_vars/all/versions.yaml +++ b/inventory/ghp/sample/group_vars/all/versions.yaml @@ -39,7 +39,7 @@ drone_version: 0.1.7 # Gitea gitea_ingress_nginx_version: 3.35.0 gitea_dns_version: 5.4.7 -gitea_version: 4.1.1 +gitea_version: 5.0.0 # Docker and Helm chart registries harbor_version: 1.7.5 diff --git a/roles/gitea/defaults/main.yaml b/roles/gitea/defaults/main.yaml index f26aed7..2ba6fe8 100644 --- a/roles/gitea/defaults/main.yaml +++ b/roles/gitea/defaults/main.yaml @@ -46,8 +46,7 @@ gitea_default_values: email: "gitea@{{ mail_domain | default(domain) }}" ldap: - enabled: true - name: OpenLDAP + - name: OpenLDAP securityProtocol: ldaps host: "{{ openldap_short_name | default('openldap')}}.{{ domain }}" port: "636" @@ -78,16 +77,13 @@ gitea_external_db_values: gitea: config: database: - DB_TYPE: postgres + DB_TYPE: "{{ gitea_db_type | default('postgres') }}" HOST: "{{ postgres_db_team | default(namespace) }}-postgres.{{ postgres_db_namespace | default(namespace) }}.svc.cluster.local:5432" - NAME: gitea + NAME: "{{ gitea_db_name | default('gitea') }}" USER: "{{ gitea_db_username | default(omit) }}" PASSWD: "{{ gitea_db_password | default(omit) }}" - - database: - builtIn: - postgresql: - enabled: false + postgresql: + enabled: false gitea_publish_ingress_nginx_values: controller: