Allow to drop publish through drop: true option

salt-formulas · Feb 14, 2018 · af99f8a · af99f8a
1 parent 84af7e6
commit af99f8a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/aptly/server/mirrors.sls b/aptly/server/mirrors.sls
@@ -157,7 +157,11 @@ aptly_{{ mirror_name }}_update:
 aptly_drop_publish_{{ pub.snapshot }}_snapshot:
   cmd.run:
   - name: aptly publish drop {{ pub.distribution }}{% if pub.get('prefix') %} {{ pub.prefix }}{% endif %}
+    {%- if pub.get('drop') %}
+  - onlyif: aptly publish show {{ pub.distribution }}{% if pub.get('prefix') %} {{ pub.prefix }}{% endif %}
+    {%- else %}
   - onlyif: aptly publish show {{ pub.distribution }}{% if pub.get('prefix') %} {{ pub.prefix }}{% endif %} | grep snapshot | grep -q -v {{ pub.snapshot }}
+    {%- endif %}
     {%- if server.source.engine != "docker" %}
   - user: {{ server.user.name }}
     {%- endif %}
@@ -166,17 +170,19 @@ aptly_drop_publish_{{ pub.snapshot }}_snapshot:
     - file: aptly_wrapper
     {%- endif %}
 
+    {%- if not pub.get('drop') %}
 aptly_publish_{{ pub.snapshot }}_snapshot:
   cmd.run:
   - name: aptly publish snapshot -batch=true -gpg-key='{{ server.gpg.keypair_id }}' -passphrase='{{ server.gpg.passphrase }}' -distribution={{ pub.distribution }}{% if pub.get('component') %} -component={{ pub.component }}{% endif %} {{ pub.snapshot }}{% if pub.get('prefix') %} {{ pub.prefix }}{% endif %} 
   - unless: aptly publish show {{ pub.distribution }}{% if pub.get('prefix') %} {{ pub.prefix }}{% endif %}
-    {%- if server.source.engine != "docker" %}
+      {%- if server.source.engine != "docker" %}
   - user: {{ server.user.name }}
-    {%- endif %}
+      {%- endif %}
   - require:
     - cmd: aptly_drop_publish_{{ pub.snapshot }}_snapshot
-    {%- if server.source.engine == "docker" %}
+      {%- if server.source.engine == "docker" %}
     - file: aptly_wrapper
+      {%- endif %}
     {%- endif %}
 
   {%- else %}