refactor(formula): align to template-formula & improve ci

.salt-lint

@@ -19,7 +19,8 @@ rules:
     ignore: |
       apache/files/Debian/ssl.conf.jinja
       apache/files/FreeBSD/mod_ssl.conf.jinja
-      apache/files/tls-defaults.conf.jinja
+      apache/files/ssl/tls-defaults.conf.jinja
+      test/salt/pillar/modules.sls
 skip_list:
   # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
   - 205  # Use ".sls" as a Salt State file extension

.travis.yml

@@ -58,35 +58,38 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    - env: INSTANCE=default-debian-10-master-py3
-    # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
-    # - env: INSTANCE=default-debian-10-2019-2-py3
-    # - env: INSTANCE=default-debian-9-2019-2-py3
-    - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=default-centos-8-2019-2-py3
-    # - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
-    - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    - env: INSTANCE=default-fedora-30-2018-3-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
-    # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
-    # - env: INSTANCE=default-centos-7-2018-3-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=default-debian-8-2017-7-py2
-    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
-    - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-30-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+    - env: INSTANCE=modules-debian-10-master-py3
+    # env: INSTANCE=modules-ubuntu-1804-master-py3
+    - env: INSTANCE=modules-centos-8-master-py3
+    - env: INSTANCE=modules-fedora-31-master-py3
+    - env: INSTANCE=modules-opensuse-leap-151-master-py3
+
+    # https://community.letsencrypt.org/t/localhost-crt-does-not-exist-or-is-empty/103979
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+
+    # - env: INSTANCE=modules-debian-10-2019-2-py3
+    # - env: INSTANCE=modules-debian-9-2019-2-py3
+    - env: INSTANCE=modules-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=modules-centos-8-2019-2-py3
+    # - env: INSTANCE=modules-fedora-31-2019-2-py3
+    # - env: INSTANCE=suse-opensuse-leap-151-2019-2-py3
+    - env: INSTANCE=modules-centos-7-2019-2-py2
+    # env: INSTANCE=default-amazonlinux-2-2019-2-py3
+    # - env: INSTANCE=modules-arch-base-latest-2019-2-py2
+    # env: INSTANCE=modules-fedora-30-2018-3-py3
+    # - env: INSTANCE=modules-debian-9-2018-3-py2
+    # - env: INSTANCE=modules-ubuntu-1604-2018-3-py2
+    # - env: INSTANCE=modules-centos-7-2018-3-py2
+    # - env: INSTANCE=modules-opensuse-leap-151-2018-3-py2
+    # - env: INSTANCE=modules-amazonlinux-1-2018-3-py2
+    # - env: INSTANCE=modules-arch-base-latest-2018-3-py2
+    # - env: INSTANCE=modules-debian-8-2017-7-py2
+    # - env: INSTANCE=modules-ubuntu-1604-2017-7-py2
+    # env: INSTANCE=default-centos-6-2017-7-py2
+    # - env: INSTANCE=modules-fedora-30-2017-7-py2
+    # - env: INSTANCE=modules-opensuse-leap-151-2017-7-py2
+    # - env: INSTANCE=modules-amazonlinux-1-2017-7-py2
+    - env: INSTANCE=arch-arch-base-latest-2017-7-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

.yamllint

@@ -12,6 +12,9 @@ ignore: |
   node_modules/
   test/**/states/**/*.sls
   .kitchen/
+  test/salt/pillar/modules.sls
+  test/salt/pillar/default.sls
+  pillar.example
 
 yaml-files:
   # Default settings

apache/certificates

@@ -0,0 +1 @@
+config/certificates/

apache/clean.sls

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .service.clean
+  - .config.clean
+  - .package.clean

apache/config/certificates/clean.sls

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_service_running = tplroot ~ '.service.running' %}
+{%- from tplroot ~ "/map.jinja" import apache with context %}
+
+include:
+  - {{ sls_service_running }}
+
+{%- for site, cert in salt['pillar.get']('apache:sites', {}).items() %}
+
+    {%- if cert.SSLCertificateKeyFile is defined %}
+
+apache_cert_config_clean_{{ site }}_key_file:
+  file.absent:
+    - name: {{ cert.SSLCertificateKeyFile }}
+    - watch_in:
+      - module: apache-service-running-reload
+    - require_in:
+      - module: apache-service-running-restart
+      - module: apache-service-running-reload
+      - service: apache-service-running
+
+    {%- endif %}
+    {%- if cert.SSLCertificateFile is defined %}
+
+apache_cert_config_clean_{{ site }}_cert_file:
+  file.absent:
+    - name: {{ cert.SSLCertificateFile }}
+    - watch_in:
+      - module: apache-service-running-reload
+    - require_in:
+      - module: apache-service-running-restart
+      - module: apache-service-running-reload
+      - service: apache-service-running
+
+    {%- endif %}
+    {%- if cert.SSLCertificateChainFile is defined %}
+
+apache_cert_config_clean_{{ site }}_bundle_file:
+  file.managed:
+    - name: {{ cert.SSLCertificateChainFile }}
+    - watch_in:
+      - module: apache-service-running-reload
+    - require_in:
+      - module: apache-service-running-restart
+      - module: apache-service-running-reload
+      - service: apache-service-running
+
+    {%- endif %}
+{%- endfor %}

apache/config/certificates/init.sls

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install