summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dan/sk-testvm.yml38
-rw-r--r--inventory/host_vars/sk-testvm.yml28
2 files changed, 35 insertions, 31 deletions
diff --git a/dan/sk-testvm.yml b/dan/sk-testvm.yml
index 39835fad..bffb2c9b 100644
--- a/dan/sk-testvm.yml
+++ b/dan/sk-testvm.yml
@@ -11,11 +11,11 @@
- name: Payload Setup
hosts: sk-testvm
vars:
- acme_client: uacme
+ # acme_client: uacme
# acme_client: acmetool
- cert_provider: "{{ acme_client }}"
+ # cert_provider: "{{ acme_client }}"
# cert_provider: static
- # cert_provider: selfsigned
+ cert_provider: selfsigned
roles:
- role: "x509/{{ cert_provider }}/base"
- role: nginx/base
@@ -58,20 +58,8 @@
'/':
root: /var/www/default
index: index.html
- # static_cert_config: "{{ static_cert_config__default }}"
- # selfsigned_cert_config:
- # cert:
- # organization_name: "elev8"
- # organizational_unit_name: "ansible"
- # key_usage:
- # - digitalSignature
- # - keyAgreement
- # key_usage_critical: yes
- # extended_key_usage:
- # - serverAuth
- # extended_key_usage_critical: yes
- # create_subject_key_identifier: yes
- # not_after: +1000w
+ static_cert_config: "{{ static_cert_config__default }}"
+ selfsigned_cert_config: "{{ selfsigned_cert_config__default }}"
include_role:
name: nginx/vhost
@@ -108,19 +96,7 @@
'/':
root: /var/www/test
index: index.html
- # static_cert_config: "{{ static_cert_config__test }}"
- # selfsigned_cert_config:
- # cert:
- # organization_name: "spreadspace"
- # organizational_unit_name: "ansible"
- # key_usage:
- # - digitalSignature
- # - keyAgreement
- # key_usage_critical: yes
- # extended_key_usage:
- # - serverAuth
- # extended_key_usage_critical: yes
- # create_subject_key_identifier: yes
- # not_after: +100w
+ static_cert_config: "{{ static_cert_config__test }}"
+ selfsigned_cert_config: "{{ selfsigned_cert_config__test }}"
include_role:
name: nginx/vhost
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index a6eed52d..1592914a 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -196,6 +196,20 @@ static_cert_config__default:
oZ2lS38fL18Aon458fbc0BPHtenfhKj5
-----END CERTIFICATE-----
+selfsigned_cert_config__default:
+ cert:
+ organization_name: "elev8"
+ organizational_unit_name: "ansible"
+ key_usage:
+ - digitalSignature
+ - keyAgreement
+ key_usage_critical: yes
+ extended_key_usage:
+ - serverAuth
+ extended_key_usage_critical: yes
+ create_subject_key_identifier: yes
+ not_after: +1000w
+
static_cert_config__test:
key:
@@ -354,3 +368,17 @@ static_cert_config__test:
oDfLD0S6+AC2R3tKpqjkNX6/91hrRFglUakyMcZU/xleqbv6+Lr3YD8PsBTub6lI
oZ2lS38fL18Aon458fbc0BPHtenfhKj5
-----END CERTIFICATE-----
+
+selfsigned_cert_config__test:
+ cert:
+ organization_name: "spreadspace"
+ organizational_unit_name: "ansible"
+ key_usage:
+ - digitalSignature
+ - keyAgreement
+ key_usage_critical: yes
+ extended_key_usage:
+ - serverAuth
+ extended_key_usage_critical: yes
+ create_subject_key_identifier: yes
+ not_after: +100w