Page MenuHomeDevCentral
Files F3785534

D3247.diff
No OneTemporary
Actions

D3247.diff
View Options

diff --git a/roles/core/certificates/init.sls b/roles/core/certificates/init.sls
--- a/roles/core/certificates/init.sls
+++ b/roles/core/certificates/init.sls
@@ -5,41 +5,5 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-{% from "roles/core/certificates/map.jinja" import certificates with context %}
-
-# -------------------------------------------------------------
-# Certificates provided by trusted sources
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-{% if "packages" in certificates %}
-
-certificates_packages:
- pkg.installed:
- - pkgs: {{ certificates.packages }}
-
-{% endif %}
-
-# -------------------------------------------------------------
-# Deploy Nasqueron certificates
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-{{ certificates.dir }}:
- file.directory:
- - makedirs: True
-
-# Vault PKI Root CA
-# Used to sign intermediate authorities for 172.27.27.* services
-{{ certificates.dir }}/nasqueron-vault-ca.crt:
- file.managed:
- - source: salt://roles/core/certificates/files/nasqueron-vault-ca.crt
- - mode: 444
-
-{% if "update-store" in certificates %}
-
-certificates_update_store:
- cmd.run:
- - name: {{ certificates["update-store"] }}
- - onchanges:
- - file: {{ certificates.dir }}/nasqueron-vault-ca.crt
-
-{% endif %}
+include:
+ - .nasqueron
diff --git a/roles/core/certificates/init.sls b/roles/core/certificates/nasqueron.sls
copy from roles/core/certificates/init.sls
copy to roles/core/certificates/nasqueron.sls

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 09:11 (19 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2266571
Default Alt Text
D3247.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator