From 93849b80018edbb2274c3cbf7ae0ccb31f2ec03d Mon Sep 17 00:00:00 2001 From: jeanluc Date: Tue, 10 May 2022 15:28:16 +0200 Subject: [PATCH] fix(config): remove unnecessary defaults for database --- .cruft.json | 5 +---- gitea/parameters/defaults.yaml | 3 --- pillar.example | 3 --- test/integration/default/files/_mapdata/almalinux-8.yaml | 3 --- test/integration/default/files/_mapdata/amazonlinux-1.yaml | 3 --- test/integration/default/files/_mapdata/amazonlinux-2.yaml | 3 --- .../integration/default/files/_mapdata/arch-base-latest.yaml | 3 --- test/integration/default/files/_mapdata/centos-6.yaml | 3 --- test/integration/default/files/_mapdata/centos-7.yaml | 3 --- test/integration/default/files/_mapdata/centos-8.yaml | 3 --- test/integration/default/files/_mapdata/debian-10.yaml | 3 --- test/integration/default/files/_mapdata/debian-11.yaml | 3 --- test/integration/default/files/_mapdata/debian-9.yaml | 3 --- test/integration/default/files/_mapdata/fedora-31.yaml | 3 --- test/integration/default/files/_mapdata/fedora-32.yaml | 3 --- test/integration/default/files/_mapdata/fedora-33.yaml | 3 --- test/integration/default/files/_mapdata/fedora-34.yaml | 3 --- test/integration/default/files/_mapdata/fedora-35.yaml | 3 --- test/integration/default/files/_mapdata/fedora-36.yaml | 3 --- test/integration/default/files/_mapdata/gentoo-2-sysd.yaml | 3 --- test/integration/default/files/_mapdata/gentoo-2-sysv.yaml | 3 --- test/integration/default/files/_mapdata/opensuse-15.yaml | 3 --- .../default/files/_mapdata/opensuse-tumbleweed.yaml | 3 --- test/integration/default/files/_mapdata/oraclelinux-7.yaml | 3 --- test/integration/default/files/_mapdata/oraclelinux-8.yaml | 3 --- test/integration/default/files/_mapdata/rockylinux-8.yaml | 3 --- test/integration/default/files/_mapdata/ubuntu-16.yaml | 3 --- test/integration/default/files/_mapdata/ubuntu-18.yaml | 3 --- test/integration/default/files/_mapdata/ubuntu-20.yaml | 3 --- test/salt/pillar/default.sls | 3 --- test/salt/pillar/upstart.sls | 3 --- 31 files changed, 1 insertion(+), 94 deletions(-) diff --git a/.cruft.json b/.cruft.json index 6df77a2..fd62e7a 100644 --- 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", diff --git a/gitea/parameters/defaults.yaml b/gitea/parameters/defaults.yaml index 9a6e941..1e3b591 100644 --- 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 diff --git a/pillar.example b/pillar.example index a3fc4ae..748e544 100644 --- 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: diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index bfb4d97..1052f37 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 6e133ee..c5a57d9 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index e48e230..a1bb206 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 6e61634..f676d34 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index 8a29203..548c1ec 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 160879a..5f56170 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index e3d0525..1988012 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index b47709d..4c542ff 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 2640a27..8f896bc 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 2de2816..8de9eb3 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 077707a..b00fadd 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 64ba8d6..fd801bf 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index c0c2929..5a51a6d 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 08a94f0..11740ff 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 35108e5..04497aa 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index 18817b2..30c9707 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 4e2559b..4ce0b4d 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 4e2559b..4ce0b4d 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 8aa3aca..f6835db 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index a445b39..157f29e 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index c02ef31..2b6d27f 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index a644e6a..8a9e0fc 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index 6105d0d..cf3596a 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index a7fc3c0..c803da3 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 364286a..4435649 100644 --- 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 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 9784399..9744724 100644 --- 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 diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index b39021c..5ea799f 100644 --- 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 diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls index b39021c..5ea799f 100644 --- 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