commit 75462f593dd606c4a910b29d62745e67b83d1a85
author Filip Pytloun <filip@pytloun.cz> Mon Feb 12 16:00:43 2018 +0100
committer GitHub <noreply@github.com> Mon Feb 12 16:00:43 2018 +0100
tree 779c4e8056cb11f240644a1c46570cc1f0148713
parent 152df597c9e4fce809c6eed4d01ac1b442479268
parent 9f45a666681e974c66256e43d94ecff95d307a84

Merge pull request #11 from bbinet/gpg-fixes

2 small fixes regarding gpg

aptly/server/init.sls

diff --git a/aptly/server/init.sls b/aptly/server/init.sls
index 2fb6501..d4ca164 100644
--- a/aptly/server/init.sls
+++ b/aptly/server/init.sls
@@ -33,6 +33,11 @@
         aptly_home: {{ server.home_dir }}
         aptly_root: {{ server.root_dir }}
     - mode: 755
+  {%- if server.secure %}
+    - require:
+      - cmd: import_gpg_pub_key
+      - cmd: import_gpg_priv_key
+  {%- endif %}
 
 aptly_installed:
   cmd.wait:
@@ -157,7 +162,7 @@
 
 import_gpg_pub_key:
   cmd.run:
-  - name: gpg --no-tty --import {{ gpgpubfile }}
+  - name: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --import {{ gpgpubfile }}
   - user: {{ server.user.name }}
   - unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-keys | grep '{{ server.gpg.keypair_id }}'
   - require: