Fix keyring
diff --git a/aptly/map.jinja b/aptly/map.jinja
index 466d9ae..b141843 100644
--- a/aptly/map.jinja
+++ b/aptly/map.jinja
@@ -14,8 +14,8 @@
'passphrase': pillar.aptly.get('server', {}).gpg_passphrase|default(''),
'public_key': pillar.aptly.get('server', {}).gpg_public_key|default(''),
'private_key': pillar.aptly.get('server', {}).gpg_private_key|default(''),
- 'keyring': '.gnupg/trustedkeys.gpg',
- 'homedir': '.gnupg',
+ 'keyring': 'trustedkeys.gpg',
+ 'homedir': null,
'keyserver': 'keys.gnupg.net',
},
'user': {
diff --git a/aptly/server/mirrors.sls b/aptly/server/mirrors.sls
index 85da3f1..e679775 100644
--- a/aptly/server/mirrors.sls
+++ b/aptly/server/mirrors.sls
@@ -44,10 +44,10 @@
gpg_add_keys_{{ mirror_name }}_{{ gpgkey }}:
cmd.run:
- - name: gpg --no-tty --no-default-keyring{% if server.gpg.get('keyring', None) %} --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }} {% endif %}--keyserver {{ mirror.keyserver|default(server.gpg.keyserver) }} --recv-keys {{ gpgkey }}
+ - name: gpg --no-tty {% if server.gpg.get('keyring', None) %} --no-default-keyring --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --keyserver {{ mirror.keyserver|default(server.gpg.keyserver) }} --recv-keys {{ gpgkey }}
- user: {{ server.user.name }}
- cwd: {{ server.home_dir }}
- - unless: gpg --no-tty --no-default-keyring{% if server.gpg.get('keyring', None) %} --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }} {% endif %}--list-public-keys {{gpgkey}}
+ - unless: gpg --no-tty {% if server.gpg.get('keyring', None) %} --no-default-keyring --keyring {{ server.gpg.keyring }} {% endif %}{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }} {% endif %}--list-public-keys {{gpgkey}}
{%- if server.secure %}
- require:
- cmd: import_gpg_priv_key