From 30fa856c3b76c5ed70d7e91af1cb3809588575e2 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 11 Apr 2020 12:55:51 +0200 Subject: [PATCH] Remove prompts and fix indent, update commits --- common.yml | 13 ------------- dns.yml | 5 ----- roles/common | 2 +- roles/database | 2 +- roles/dns | 2 +- roles/monitoring | 2 +- roles/web | 2 +- web.yml | 17 +++-------------- 8 files changed, 8 insertions(+), 37 deletions(-) diff --git a/common.yml b/common.yml index 6844c4c..51dede5 100644 --- a/common.yml +++ b/common.yml @@ -1,17 +1,4 @@ --- - hosts: all - vars_prompt: - - name: packages - prompt: "Install packages?" - private: no - default: false - - name: user - prompt: "Set up users?" - private: no - default: false - - name: iptables - prompt: "Set up firewall?" - private: no - default: true roles: - common diff --git a/dns.yml b/dns.yml index ce0a431..52d2783 100644 --- a/dns.yml +++ b/dns.yml @@ -1,9 +1,4 @@ --- - hosts: dns - vars_prompt: - - name: unbound - prompt: "Install unbound" - private: no - default: false roles: - dns diff --git a/roles/common b/roles/common index 169bd35..6721553 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit 169bd35d83682d8c20b382e84f4c5777defee6a6 +Subproject commit 6721553a2dde0a47ce2762535287ce3b3dd9fd35 diff --git a/roles/database b/roles/database index ca6968c..4d0231a 160000 --- a/roles/database +++ b/roles/database @@ -1 +1 @@ -Subproject commit ca6968c59e4ae6c5e807d68c8a9eea6bdf60eb69 +Subproject commit 4d0231ad82aa641b5d69811821794caa846c5466 diff --git a/roles/dns b/roles/dns index dec156e..711c4c2 160000 --- a/roles/dns +++ b/roles/dns @@ -1 +1 @@ -Subproject commit dec156e069a4f11473b6ee30ad7a651bb8d10875 +Subproject commit 711c4c25ae4ce627d4b44b5061a6471f4e7950cb diff --git a/roles/monitoring b/roles/monitoring index 26e73fd..4ebafc1 160000 --- a/roles/monitoring +++ b/roles/monitoring @@ -1 +1 @@ -Subproject commit 26e73fd2faec21e37cd7ab3781b0393277afdbd2 +Subproject commit 4ebafc1e6f77932593fb3d70c91eea6b86a4d0e4 diff --git a/roles/web b/roles/web index 921de97..d55a077 160000 --- a/roles/web +++ b/roles/web @@ -1 +1 @@ -Subproject commit 921de97f863e45bc2549135eb893a1002cbc3946 +Subproject commit d55a077230b928a6a41df3a82d7539d8443ec8d6 diff --git a/web.yml b/web.yml index d200d2e..b22ce14 100644 --- a/web.yml +++ b/web.yml @@ -1,17 +1,6 @@ --- - hosts: web - vars_prompt: - - name: frontend - prompt: "Setup frontend" - private: no - default: false - - name: cert - prompt: "Copy certificate (requires vault pass)" - private: no - default: false - - name: firewall - prompt: "Setup firewall" - private: no - default: true + vars_files: + - '{{ role_path }}/vars/domains.yml' roles: - - web + - web