diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-09-13 19:52:01 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-09-13 19:52:01 +0000 |
| commit | 95d45cade26104fded40edc8fd2e5f3c9601c60d (patch) | |
| tree | 369810882d3760194e72e8936ee43f813cd43805 | |
| parent | Releasing debian version 20190101-6. (diff) | |
| download | progress-linux-95d45cade26104fded40edc8fd2e5f3c9601c60d.tar.xz progress-linux-95d45cade26104fded40edc8fd2e5f3c9601c60d.zip | |
Using signed-by in sources.list instead of symlinking keyring into apt keyring.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rwxr-xr-x | debian/progress-linux.postinst | 16 | ||||
| -rwxr-xr-x | debian/progress-linux.postrm | 7 |
2 files changed, 1 insertions, 22 deletions
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst index ba72cc8..4750342 100755 --- a/debian/progress-linux.postinst +++ b/debian/progress-linux.postinst @@ -31,17 +31,6 @@ Remove_apt_preferences () rm -f "/etc/apt/preferences.d/${PROJECT}.pref" } -Install_apt_keys () -{ - rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg" - ln -s "/usr/share/${PROJECT}/pgp-keys/apt.${DOMAIN}.gpg" "/etc/apt/trusted.gpg.d/${PROJECT}.gpg" -} - -Remove_apt_keys () -{ - rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg" -} - Configure_apt_sources () { ARCHIVE="${1}" @@ -57,7 +46,7 @@ Configure_apt_sources () esac cat >> "/etc/apt/sources.list.d/${PROJECT}.list" << EOF -deb ${PACKAGES} ${ARCHIVE} ${AREAS} +deb [signed-by=/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg] ${PACKAGES} ${ARCHIVE} ${AREAS} EOF } @@ -147,7 +136,6 @@ case "${1}" in Remove_apt_sources Remove_apt_preferences - Remove_apt_keys Remove_ssh_known_hosts @@ -160,7 +148,6 @@ case "${1}" in then Install_apt_sources Install_apt_preferences - Install_apt_keys for ARCHIVE in ${ARCHIVES} do @@ -170,7 +157,6 @@ case "${1}" in else Remove_apt_sources Remove_apt_preferences - Remove_apt_keys fi # openssh-server diff --git a/debian/progress-linux.postrm b/debian/progress-linux.postrm index 391291d..38f85e8 100755 --- a/debian/progress-linux.postrm +++ b/debian/progress-linux.postrm @@ -17,12 +17,6 @@ Remove_apt_preferences () rm -f "/etc/apt/preferences.d/${PROJECT}.pref" } -Remove_apt_keys () -{ - # apt keys - rm -f "/etc/apt/trusted.gpg.d/${PROJECT}.gpg" -} - Remove_ssh_known_hosts () { if [ ! -e /etc/ssh/ssh_known_hosts ] @@ -49,7 +43,6 @@ case "${1}" in # apt Remove_apt_sources Remove_apt_preferences - Remove_apt_keys # openssh-server Remove_ssh_known_hosts |