fix(config): remove unnecessary defaults for database

2022-05-10 15:28:16 +02:00
parent 8e60cabc64
commit 93849b8001
31 changed files with 1 additions and 94 deletions
--- a/.cruft.json
+++ b/.cruft.json
@@ -64,10 +64,7 @@
        },
        "config": {
          "database": {
-            "db_type": "sqlite3",
-            "name": "gitea",
-            "user": "root",
-            "password": "hunter1"
+            "db_type": "sqlite3"
          },
          "default": {
            "app_name": "Gitea",
--- a/gitea/parameters/defaults.yaml
+++ b/gitea/parameters/defaults.yaml
@@ -36,9 +36,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/pillar.example
+++ b/pillar.example
@@ -32,9 +32,6 @@ gitea:
      # an example.
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root

      # Values in `default` are dumped without an associated scope.
    default:
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -38,9 +38,6 @@ values:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -37,9 +37,6 @@ gitea:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod
--- a/test/salt/pillar/upstart.sls
+++ b/test/salt/pillar/upstart.sls
@@ -37,9 +37,6 @@ gitea:
  config:
    database:
      db_type: sqlite3
-      name: gitea
-      password: hunter1
-      user: root
    default:
      app_name: Gitea
      run_mode: prod