fix(config): Include custom configuration in global file

Previously, this formula generated two configuration files,
a global one for database and secrets setup and
a custom one for all other settings in `custom/conf/app.ini`.

This did not work as intended.

test/integration/default/files/_mapdata/almalinux-8.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/amazonlinux-1.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/amazonlinux-2.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/arch-base-latest.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/centos-6.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/centos-7.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/centos-8.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/debian-10.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/debian-11.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/debian-9.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-31.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-32.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-33.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-34.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-35.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/fedora-36.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/gentoo-2-sysd.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/gentoo-2-sysv.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/opensuse-15.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/oraclelinux-7.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/oraclelinux-8.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/rockylinux-8.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/ubuntu-16.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/ubuntu-18.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/integration/default/files/_mapdata/ubuntu-20.yaml

@@ -37,6 +37,11 @@ values:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -45,23 +50,19 @@ values:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/salt/pillar/default.sls

@@ -36,6 +36,11 @@ gitea:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -44,23 +49,19 @@ gitea:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false

test/salt/pillar/upstart.sls

@@ -36,6 +36,11 @@ gitea:
     shell: /bin/bash
     user: git
   config:
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
     default:
       app_name: Gitea
       run_mode: prod
@@ -44,23 +49,19 @@ gitea:
       level: Info
       mode: console
       stacktrace_level: None
+    oauth2:
+      jwt_secret: ''
     repository.signing:
       signing_key: default
+    security:
+      internal_token: ''
+      secret_key: ''
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+      lfs_jwt_secret: ''
       protocol: http
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
   service:
     requires_mount: []
     socket_activation: false