diff --git a/CHANGELOG.md b/CHANGELOG.md index d81eb470..2390187a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release. ### Changed +* apt: store keys in /etc/apt/trusted.gpg.d in ascii format * evolinux-base: copy GPG key instead of using apt-key * ntpd: Add leapfile configuration setting to ntpd on debian 10+ * certbot: sync_remote.sh is configurable diff --git a/apt/tasks/evolix_public.yml b/apt/tasks/evolix_public.yml index 1815f08e..d6822f28 100644 --- a/apt/tasks/evolix_public.yml +++ b/apt/tasks/evolix_public.yml @@ -3,8 +3,8 @@ # https://wiki.debian.org/DebianRepository/UseThirdParty - name: Add Evolix GPG key copy: - src: reg.gpg - dest: /usr/share/keyrings/reg.gpg + src: reg.asc + dest: /etc/apt/trusted.gpg.d/reg.asc force: yes mode: "0644" tags: diff --git a/apt/templates/evolix_public.list.j2 b/apt/templates/evolix_public.list.j2 index 72127536..06de99c0 100644 --- a/apt/templates/evolix_public.list.j2 +++ b/apt/templates/evolix_public.list.j2 @@ -1,3 +1,3 @@ # {{ ansible_managed }} -deb [signed-by=/usr/share/keyrings/reg.gpg] http://pub.evolix.net/ {{ ansible_distribution_release }}/ +deb http://pub.evolix.net/ {{ ansible_distribution_release }}/