Merge branch 'master' into feature/specify_gpgkey_on_pillar

salt-formulas · May 29, 2017 · 0178131 · 0178131
2 parents 0105dcc + 9fbf40c
commit 0178131
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/aptly/map.jinja b/aptly/map.jinja
@@ -10,10 +10,10 @@
     'secure': True,
     'repo': {},
     'gpg': {
-      'keypair_id': pillar.aptly.server.gpg_keypair_id|default(''),
-      'passphrase': pillar.aptly.server.gpg_passphrase|default(''),
-      'public_key': pillar.aptly.server.gpg_public_key|default(''),
-      'private_key': pillar.aptly.server.gpg_private_key|default(''),
+      'keypair_id': pillar.aptly.get('server', {}).gpg_keypair_id|default(''),
+      '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',
       'keyserver': 'keys.gnupg.net',

diff --git a/aptly/server/init.sls b/aptly/server/init.sls
@@ -164,8 +164,8 @@ import_gpg_pub_key:
   - user: aptly
   - unless: gpg --no-tty{% if server.gpg.get('homedir', None) %} --homedir {{ server.gpg.homedir }}{% endif %} --list-keys | grep '{{ server.gpg.keypair_id }}'
   - require:
-    - file: aptly_gpg_key_dir
     - file: gpg_pub_key
+    - cmd: import_gpg_priv_key
 
 import_gpg_priv_key:
   cmd.run:

diff --git a/aptly/server/mirrors.sls b/aptly/server/mirrors.sls
@@ -22,12 +22,6 @@ cron_path:
     - name: PATH
     - value: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 
-{# TODO: remove me after some time #}
-aptly_mirror_update_cron_absent_obsolete:
-  cron.absent:
-  - identifier: aptly_mirror_update
-  - user: root
-
 {%- else %}
 
 aptly_mirror_update_cron:
@@ -39,12 +33,6 @@ aptly_mirror_update_cron:
   - user: root
   {%- endif %}
 
-{# TODO: remove me after some time #}
-aptly_mirror_update_cron_obsolete:
-  cron.absent:
-  - identifier: aptly_mirror_update
-  - user: root
-
 {% endif %}
 
 
@@ -57,16 +45,21 @@ aptly_mirror_update_cron_obsolete:
 {%- for gpgkey in mirror.get('gpgkeys', []) %}
 gpg_add_keys_{{ mirror_name }}_{{ gpgkey }}:
   cmd.run:
-{%- if gpgkey|length > 1 %}
+  {%- if gpgkey|length > 1 %}
   - name: echo "{{ gpgkey|indent(0, true)}}" | gpg --import {{ _gpg_attributes }}
-{%- else %}
+  {%- else %}
   - name: gpg {{ _gpg_attributes }} --keyserver {{ mirror.keyserver|default(server.gpg.keyserver) }} --recv-keys {{ gpgkey }}
   - unless: gpg  {{ _gpg_attributes }} --list-public-keys {{ gpgkey }}
-{%- endif %}
-{%- if server.source.engine != "docker" %}
+  {%- endif %}
   - user: {{ server.user.name }}
   - cwd: {{ server.home_dir }}
-{%- endif %}
+  {%- if server.secure %}
+  - require:
+    - cmd: import_gpg_priv_key
+    - cmd: import_gpg_pub_key
+  - require_in:
+    - cmd: aptly_{{ mirror_name }}_mirror
+  {%- endif %}
 
 {%- endfor %}