From 1a3d789ba4350f997bf95ea231809f28d38ed313 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sun, 11 Aug 2019 16:33:51 +0200
Subject: [PATCH] gitlab: Make variable name consistent with other vault
passwords
---
group_vars/all/vault_gitlab.yml | 14 +++++++-------
roles/gitlab/tasks/main.yml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/group_vars/all/vault_gitlab.yml b/group_vars/all/vault_gitlab.yml
index 1e8625549..34ead5ccd 100644
--- a/group_vars/all/vault_gitlab.yml
+++ b/group_vars/all/vault_gitlab.yml
@@ -1,8 +1,8 @@
$ANSIBLE_VAULT;1.1;AES256
-30373662313233366335326465303964376230346234633438356330643962626338356133333764
-3639366535343030303632303766656663633937393561370a653062383335333531336363323835
-32663063313964353937663234313263363937653039333162616437393766666337356632366332
-3434636134643030640a613462353965333339643366313239643665346333383336633765316364
-35366330363333386665323232316334613333363134353039633935643738373835383934383632
-63313037613131613232343561333034323862363534363562333436616366306434366462646330
-656163303863373565656233646239633064
+36396465626461343164353065376462333266653533303334393434653166346335323666336534
+3263613762343039313031356233646139633865633636370a366136386262666664346131353065
+62656436303531376561386164353431313631653831646331656265663837396363313766303562
+3138333262373032310a393266386436646363663837363863373130623532643630373337626339
+35366639353062626132616335386634376565363135333136646538346532363263346234393038
+61353638356334393863343337633363393537313039306263346534316363316462396161373939
+633563613165373538376266396132646631
diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml
index 1b88b875c..98e9563a4 100644
--- a/roles/gitlab/tasks/main.yml
+++ b/roles/gitlab/tasks/main.yml
@@ -25,7 +25,7 @@
letsencrypt['contact_emails'] = ['webmaster@archlinux.org']
gitlab_rails['lfs_enabled'] = true
gitlab_rails['gitlab_shell_ssh_port'] = 222
- gitlab_rails['initial_root_password'] = "{{ gitlab_root_password }}"
+ gitlab_rails['initial_root_password'] = "{{ vault_gitlab_root_password }}"
gitlab_rails['smtp_enable'] = true
gitlab_rails['smtp_address'] = 'mail.archlinux.org'
gitlab_rails['smtp_port'] = 587
--
GitLab