From 36191c96057e3c9babe2f173f4c6ca3ebe8f6828 Mon Sep 17 00:00:00 2001 From: nono Date: Wed, 21 Dec 2022 01:02:31 +0100 Subject: [PATCH] reorg directories --- {roles/cfssl-server => cfssl-server}/defaults/main.yml | 0 {roles/cfssl-server => cfssl-server}/handlers/main.yml | 0 {roles/cfssl-server => cfssl-server}/tasks/main.yml | 0 .../cfssl-server => cfssl-server}/tasks/pre_requisite.yml | 0 .../cfssl-server => cfssl-server}/templates/cfssl.json.j2 | 0 .../templates/cfssl.service.j2 | 0 .../templates/csr_ROOT_CA.json.j2 | 0 .../templates/csr_intermediate_CA.json.j2 | 0 {roles/cfssl-server => cfssl-server}/templates/db.json.j2 | 0 {roles/cfssl-server => cfssl-server}/templates/init.sql.j2 | 0 roles/cfssl-server/templates/csr.json.j2 | 6 ------ 11 files changed, 6 deletions(-) rename {roles/cfssl-server => cfssl-server}/defaults/main.yml (100%) rename {roles/cfssl-server => cfssl-server}/handlers/main.yml (100%) rename {roles/cfssl-server => cfssl-server}/tasks/main.yml (100%) rename {roles/cfssl-server => cfssl-server}/tasks/pre_requisite.yml (100%) rename {roles/cfssl-server => cfssl-server}/templates/cfssl.json.j2 (100%) rename {roles/cfssl-server => cfssl-server}/templates/cfssl.service.j2 (100%) rename {roles/cfssl-server => cfssl-server}/templates/csr_ROOT_CA.json.j2 (100%) rename {roles/cfssl-server => cfssl-server}/templates/csr_intermediate_CA.json.j2 (100%) rename {roles/cfssl-server => cfssl-server}/templates/db.json.j2 (100%) rename {roles/cfssl-server => cfssl-server}/templates/init.sql.j2 (100%) delete mode 100644 roles/cfssl-server/templates/csr.json.j2 diff --git a/roles/cfssl-server/defaults/main.yml b/cfssl-server/defaults/main.yml similarity index 100% rename from roles/cfssl-server/defaults/main.yml rename to cfssl-server/defaults/main.yml diff --git a/roles/cfssl-server/handlers/main.yml b/cfssl-server/handlers/main.yml similarity index 100% rename from roles/cfssl-server/handlers/main.yml rename to cfssl-server/handlers/main.yml diff --git a/roles/cfssl-server/tasks/main.yml b/cfssl-server/tasks/main.yml similarity index 100% rename from roles/cfssl-server/tasks/main.yml rename to cfssl-server/tasks/main.yml diff --git a/roles/cfssl-server/tasks/pre_requisite.yml b/cfssl-server/tasks/pre_requisite.yml similarity index 100% rename from roles/cfssl-server/tasks/pre_requisite.yml rename to cfssl-server/tasks/pre_requisite.yml diff --git a/roles/cfssl-server/templates/cfssl.json.j2 b/cfssl-server/templates/cfssl.json.j2 similarity index 100% rename from roles/cfssl-server/templates/cfssl.json.j2 rename to cfssl-server/templates/cfssl.json.j2 diff --git a/roles/cfssl-server/templates/cfssl.service.j2 b/cfssl-server/templates/cfssl.service.j2 similarity index 100% rename from roles/cfssl-server/templates/cfssl.service.j2 rename to cfssl-server/templates/cfssl.service.j2 diff --git a/roles/cfssl-server/templates/csr_ROOT_CA.json.j2 b/cfssl-server/templates/csr_ROOT_CA.json.j2 similarity index 100% rename from roles/cfssl-server/templates/csr_ROOT_CA.json.j2 rename to cfssl-server/templates/csr_ROOT_CA.json.j2 diff --git a/roles/cfssl-server/templates/csr_intermediate_CA.json.j2 b/cfssl-server/templates/csr_intermediate_CA.json.j2 similarity index 100% rename from roles/cfssl-server/templates/csr_intermediate_CA.json.j2 rename to cfssl-server/templates/csr_intermediate_CA.json.j2 diff --git a/roles/cfssl-server/templates/db.json.j2 b/cfssl-server/templates/db.json.j2 similarity index 100% rename from roles/cfssl-server/templates/db.json.j2 rename to cfssl-server/templates/db.json.j2 diff --git a/roles/cfssl-server/templates/init.sql.j2 b/cfssl-server/templates/init.sql.j2 similarity index 100% rename from roles/cfssl-server/templates/init.sql.j2 rename to cfssl-server/templates/init.sql.j2 diff --git a/roles/cfssl-server/templates/csr.json.j2 b/roles/cfssl-server/templates/csr.json.j2 deleted file mode 100644 index 2419c3b..0000000 --- a/roles/cfssl-server/templates/csr.json.j2 +++ /dev/null @@ -1,6 +0,0 @@ -{ - "CN": {{item.cname | to_json}}, - "hosts": {{ (item.sans|default([]) + item.altips|default([]) + item.cname.split(',')) | to_json}}, - "key" : {{item.key | default(pki_key) | to_json}}, - "names" : {{item.names | default(pki_names) | to_json}} -}