From 7b6675a9d0a513ef382f5e484ab3cd47644b7083 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 21 Dec 2021 20:12:05 +0000 Subject: [PATCH] Move gitlab variables to single vault --- ansible/roles/gitlab/tasks/main.yml | 3 +++ ansible/roles/gitlab/vars/main.yml | 24 +++--------------------- ansible/roles/gitlab/vars/vault.yml | 12 ++++++++++++ 3 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 ansible/roles/gitlab/vars/vault.yml diff --git a/ansible/roles/gitlab/tasks/main.yml b/ansible/roles/gitlab/tasks/main.yml index 23c2366..f997702 100644 --- a/ansible/roles/gitlab/tasks/main.yml +++ b/ansible/roles/gitlab/tasks/main.yml @@ -1,3 +1,6 @@ +- name: Include vault + include_vars: vault.yml + - name: Install and configure GitLab import_role: name: geerlingguy.gitlab diff --git a/ansible/roles/gitlab/vars/main.yml b/ansible/roles/gitlab/vars/main.yml index e26a275..4881f08 100644 --- a/ansible/roles/gitlab/vars/main.yml +++ b/ansible/roles/gitlab/vars/main.yml @@ -1,23 +1,5 @@ gitlab_config_template: files/gitlab.rb gitlab_create_self_signed_cert: false -gitlab_smtp_password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65613432613564643737373038393834363865356139636239393635373437323730646166366539 - 3264306365663964383364643530313731356565393364310a333364396164303933383364323564 - 32653239623662306437383332376233633764303131613733646661316261373130363763623064 - 3832323835653964620a393264353864393066303264343438336665626266643338666564386532 - 62626366343236623337353566623764653633356435623961623835313462343632 -gitlab_smtp_user: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65363932326464623165396365326130383464336166343832643563356363363930373339386534 - 3530316232363430386666623736366632313439313934360a313862646530383833383737333332 - 31313931626464636231616465313635306363666165383437386136383463646532626566376133 - 6134663039653633360a353036336135366530336530313562626262653130626463393836643435 - 66313166656461363931383837323937363365656139323564383263653037333434 -gitlab_from_email: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65643234353935653465613934373736643931396363303734336233393335346431373136356630 - 3234363436383761346135613039353562643438306532630a383937346662306538623533623430 - 34346434653530613764626661396463323634336365653232616661306437333034313137316231 - 6465396332383363320a316632306261363964623263626539373037366638323834623533366335 - 39383566353935353066306139626337643165333161653430393137323438623132 +gitlab_smtp_password: "{{ vault_gitlab_smtp_password }}" +gitlab_smtp_user: "{{ vault_gitlab_smtp_user }}" +gitlab_from_email: "{{ vault_gitlab_from_email }}" diff --git a/ansible/roles/gitlab/vars/vault.yml b/ansible/roles/gitlab/vars/vault.yml new file mode 100644 index 0000000..3a7e5a2 --- /dev/null +++ b/ansible/roles/gitlab/vars/vault.yml @@ -0,0 +1,12 @@ +$ANSIBLE_VAULT;1.1;AES256 +61366238363431353336613362396330363337633339363735383438383939353532376539316263 +6133383136353261386239303730633431653434343636350a353339393932396634656164333035 +65353136333962366334396139316264646666353964643332313933346132303066323231626433 +3761333362396231650a373935363763343831626431633930336337393037633933346339366135 +34653062663737313833623731343462303935376131343061643632336366656636356439653534 +39373430626466353333646638363936383932373161376135376239383231633665303439393939 +62336361643336616634376562613963636461356265303834313162643261323433393965613762 +31663133383163346434343662613965306234306563343565663362386563633664623538343363 +63333965623262653735386563393162386532643362626562643539356339363131396430633030 +31383361396265366237613635323839633562663264666638323531373933363733303839656564 +626432386162306638356434616465396265