diff --git a/.cruft.json b/.cruft.json index d1a3a2b..e70efdf 100644 --- a/.cruft.json +++ b/.cruft.json @@ -38,8 +38,7 @@ }, "requirements": [ "git", - "gpg", - "python-gnupg" + "gpg" ], "build_user": "giteabuild", "build_user_home": "/home/giteabuild", diff --git a/gitea/parameters/defaults.yaml b/gitea/parameters/defaults.yaml index 9200b45..18c7147 100644 --- a/gitea/parameters/defaults.yaml +++ b/gitea/parameters/defaults.yaml @@ -45,7 +45,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/gitea/parameters/os_family/Debian.yaml b/gitea/parameters/os_family/Debian.yaml index 38a9b93..9ee9b72 100644 --- a/gitea/parameters/os_family/Debian.yaml +++ b/gitea/parameters/os_family/Debian.yaml @@ -13,8 +13,4 @@ values: lookup: pkg_manager: apt - requirements: - - git - - gpg - - python3-gnupg ... diff --git a/gitea/parameters/os_family/RedHat.yaml b/gitea/parameters/os_family/RedHat.yaml index e1c1e55..69885b0 100644 --- a/gitea/parameters/os_family/RedHat.yaml +++ b/gitea/parameters/os_family/RedHat.yaml @@ -13,4 +13,7 @@ values: lookup: pkg_manager: yum + requirements: + - gnupg2 + - git ... diff --git a/pillar.example b/pillar.example index fe28700..b699ec9 100644 --- a/pillar.example +++ b/pillar.example @@ -110,7 +110,6 @@ gitea: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 5055c42..0b1bb24 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 1e3eb63..7d7fb42 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index c97295d..0c080d6 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 711e11a..a83eb23 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index b29a16e..d381d71 100644 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ b/test/integration/default/files/_mapdata/centos-6.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 20a0c57..3bdd2cb 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 3fda4a1..9194e14 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index d862b21..a3d4f97 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 748c455..2934927 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 58c2f5e..7d5c59d 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 0637c47..137d734 100644 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ b/test/integration/default/files/_mapdata/fedora-31.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 3308ab1..6c2c1d5 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 336def8..3054a39 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 5299a62..7d81fa6 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 65b965f..0a1493d 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index 609ecde..df164b4 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 9d445c2..23e9413 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 9d445c2..23e9413 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index cca9ec4..7d05087 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 2def1b5..b7e38cc 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index e28794b..9fd9ef3 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 33b71c2..c8e00f4 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index b01bbc0..ca3cebe 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 12415f6..d7a23b4 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 7aa3465..77ede78 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index ae065c2..db94e44 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml index 0cfd1ea..d45b12c 100644 --- a/test/integration/default/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml @@ -48,7 +48,6 @@ values: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index 9f32446..3e6e680 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -46,7 +46,6 @@ gitea: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls index 9f32446..3e6e680 100644 --- a/test/salt/pillar/upstart.sls +++ b/test/salt/pillar/upstart.sls @@ -46,7 +46,6 @@ gitea: requirements: - git - gpg - - python-gnupg shell: /bin/bash user: git config: