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.

pillar.example

@@ -9,25 +9,6 @@ gitea:
     # will do that automatically on subsequent runs.
   version: latest
 
-    # Since this formula skips the web installer,
-    # the database configuration is required. This is just
-    # an example. All specified values will be dumped into the
-    # global configuration file.
-  database:
-    db_type: sqlite3
-    name: gitea
-    password: hunter1
-    user: root
-
-    # (Some of) those secrets would be generated by the web installer.
-    # Specify them here explicitly or let Salt handle their generation.
-    # In the latter case, they will be saved in a grain value on the minion.
-  secrets:
-    internal_token: ''
-    jwt_secret: ''
-    lfs_jwt_secret: ''
-    secret_key: ''
-
     # Service configuration allows to request mount paths or
     # other service units. This is especially important if you
     # run Memcached/Redis. For databases, `post-map.jinja` appends
@@ -41,12 +22,21 @@ gitea:
     socket_activation: false
     wants: []
 
-    # This is the custom configuration. Values in `default` are dumped
-    # without an associated scope. For possible configuration values,
+    # This is the custom configuration.  For possible configuration values,
     # see the official docs or the example file.
     # It is recommended to keep all the keys lowercase to avoid
     # issues with some autoconfiguration done by this formula.
   config:
+      # Since this formula skips the web installer,
+      # the database configuration is required. This is just
+      # an example.
+    database:
+      db_type: sqlite3
+      name: gitea
+      password: hunter1
+      user: root
+
+      # Values in `default` are dumped without an associated scope.
     default:
       app_name: Gitea
       run_mode: prod
@@ -57,13 +47,30 @@ gitea:
       mode: console
       stacktrace_level: None
 
+      # If this secret is unspecified, it will be autogenerated by Salt
+      # and be saved as a minion grain value.
+    oauth2:
+      jwt_secret: ''
+
+      # Children of scopes are expressed with a dot.
     repository.signing:
       signing_key: default
 
+      # Those secrets would be generated by the web installer.
+      # Specify them here explicitly or let Salt handle their generation.
+      # In the latter case, `internal_token_uri` will be set to a file
+      # generated by gitea and `secret_key` will be saved as a minion grain value.
+    security:
+      internal_token: ''
+      secret_key: ''
+
     server:
       domain: localhost
       http_addr: 0.0.0.0
       http_port: 3000
+        # If this secret is unspecified, it will be autogenerated by Salt
+        # and be saved as a minion grain value.
+      lfs_jwt_secret: ''
       protocol: http
 
     # This is where a lot of the default parameters are looked up.