浏览代码

common was missing db admin user pass in default vars.

Thomas Buck 5 年前
父节点
当前提交
3dc25b1bc9
共有 3 个文件被更改,包括 5 次插入1 次删除
  1. 3
    0
      roles/common/defaults/main.yml
  2. 1
    0
      roles/mailserver/defaults/main.yml
  3. 1
    1
      roles/news/defaults/main.yml

+ 3
- 0
roles/common/defaults/main.yml 查看文件

@@ -9,6 +9,9 @@ secret_root: '{{ inventory_dir | realpath }}'
9 9
 secret_name: 'secret'
10 10
 secret: '{{ secret_root + "/" + secret_name }}'
11 11
 
12
+db_admin_username: 'postgres'
13
+db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password', length=32) }}"
14
+
12 15
 # let's encrypt
13 16
 letsencrypt_server: "https://acme-v01.api.letsencrypt.org/directory"
14 17
 

+ 1
- 0
roles/mailserver/defaults/main.yml 查看文件

@@ -2,6 +2,7 @@ secret_root: '{{ inventory_dir | realpath }}'
2 2
 secret_name: 'secret'
3 3
 secret: '{{ secret_root + "/" + secret_name }}'
4 4
 
5
+# must match values in roles/common
5 6
 db_admin_username: 'postgres'
6 7
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password', length=32) }}"
7 8
 

+ 1
- 1
roles/news/defaults/main.yml 查看文件

@@ -12,6 +12,6 @@ selfoss_username: "{{ main_user_name }}"
12 12
 # this is the sha512 hash of the desired password
13 13
 selfoss_password_hash: "{{ lookup('password', secret + '/' + 'selfoss_password_hash', length=32, crypt='sha512')|hash('sha512') }}"
14 14
 
15
-# must match values in roles/mailserver
15
+# must match values in roles/common
16 16
 db_admin_username: 'postgres'
17 17
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password', length=32) }}"

正在加载...
取消
保存