From e9cff78c572f6a3ba3347fc6bd13c859c132ba38 Mon Sep 17 00:00:00 2001
From: AnsibleGuy <guy@ansibleguy.net>
Date: Fri, 10 Jun 2022 23:44:35 +0200
Subject: [PATCH] changed default certificate-type to 'minimal-ca', updated
 molecule

---
 README.md                     | 4 ++--
 defaults/main.yml             | 2 +-
 molecule/default/converge.yml | 4 ++--
 molecule/default/molecule.yml | 5 +----
 molecule/default/verify.yml   | 5 ++++-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c9857db..3bb14d3 100644
--- a/README.md
+++ b/README.md
@@ -69,8 +69,8 @@ zoneminder:
     aliases: ['zm.template.ansibleguy.net']
 
     ssl:
-      mode: 'letsencrypt'  # or selfsigned
-      #  if you use 'selfsigned':
+      mode: 'letsencrypt'  # or selfsigned/ca
+      #  if you use 'selfsigned' or 'ca':
       #    cert:
       #      cn: 'ZoneMinder Server'
       #      org: 'AnsibleGuy'
diff --git a/defaults/main.yml b/defaults/main.yml
index 4da1ca0..095071a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,7 +49,7 @@ default_zm:
     app_include: true  # DO NOT CHANGE!
 
     ssl:  # see: https://github.com/ansibleguy/infra_certs
-      mode: 'selfsigned'  # existing/selfsigned/ca/letsencrypt
+      mode: 'ca'  # existing/selfsigned/ca/letsencrypt
       cert:
         name:
         cn: 'NextCloud Certificate'
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 885cd59..57a67db 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -2,7 +2,6 @@
 
 - name: Converge
   hosts: grp_targets
-  strategy: free  # speed-up; comment-out to gain clarity
   vars:
     no_prompts: true  # mariadb prompts
 
@@ -16,9 +15,10 @@
 
       apache:
         domain: 'zoneminder.test.ansibleguy.net'
+        ip: '192.168.0.2'
 
         ssl:
-          mode: 'selfsigned'
+          mode: 'ca'
           cert:
             cn: 'ZoneMinder'
             org: 'AnsibleGuy Test'
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 02e465b..bd046fa 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -34,14 +34,11 @@ platforms:
   - name: test-ag-zm-1
     networks:
       - name: 'test-ag-zm'
-        ipv4_address: '192.168.0.20'
+        ipv4_address: '192.168.0.2'
     groups: [grp_targets]
     <<: *docker_all
 
 provisioner:
   name: ansible
-  #  config_options:
-  #    defaults:
-  #      vault_password_file: '~/.vault_pwd_file'
 verifier:
   name: ansible
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 85fba02..e0533de 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -6,5 +6,8 @@
   tasks:
   - name: Checking if zoneminder web-service is reachable
     ansible.builtin.uri:
-      url: 'https://192.168.0.20'
+      url: 'https://192.168.0.2'
+      return_content: yes
       validate_certs: false
+    register: page
+    failed_when: "'Zoneminder' not in page.content"