thomas
/
sovereign
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

remove unnecessary secret_* everywhere

Thomas Buck 3 years ago
parent
7c5537b78d
commit
97ceee0704
16 changed files with 0 additions and 68 deletions
Unified View Show Diff Stats
  1. 0
    4
      roles/backup/defaults/main.yml
  2. 0
    5
      roles/blog/defaults/main.yml
  3. 0
    5
      roles/common/defaults/main.yml
  4. 0
    4
      roles/gitea/defaults/main.yml
  5. 0
    4
      roles/iot/defaults/main.yml
  6. 0
    4
      roles/ircbouncer/defaults/main.yml
  7. 0
    4
      roles/mailserver/defaults/main.yml
  8. 0
    4
      roles/mastodon/defaults/main.yml
  9. 0
    4
      roles/matrix/defaults/main.yml
  10. 0
    4
      roles/monitoring/defaults/main.yml
  11. 0
    4
      roles/news/defaults/main.yml
  12. 0
    4
      roles/nextcloud/defaults/main.yml
  13. 0
    5
      roles/sslletsencrypt/defaults/main.yml
  14. 0
    5
      roles/sslselfsigned/defaults/main.yml
  15. 0
    4
      roles/webmail/defaults/main.yml
  16. 0
    4
      roles/xmpp/defaults/main.yml

+ 0
- 4
roles/backup/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 backup_vpn_net: "10.8.0.0/24"
 1 
 backup_vpn_net: "10.8.0.0/24"
6 
 backup_vpn_bridge: "10.8.0.2"
 2 
 backup_vpn_bridge: "10.8.0.2"
7 
 backup_host: "192.168.0.10"
 3 
 backup_host: "192.168.0.10"

+ 0
- 5
roles/blog/defaults/main.yml View File

1 
-# pass
2 
-secret_root: '{{ inventory_dir | realpath }}'
3 
-secret_name: 'secret'
4 
-secret: '{{ secret_root + "/" + secret_name }}'
5 
-
6 
 fathom_admin_username: "{{ admin_email }}"
 1 
 fathom_admin_username: "{{ admin_email }}"
7 
 fathom_admin_password: "{{ lookup('password', secret + '/' + 'fathom_admin_password length=32') }}"
 2 
 fathom_admin_password: "{{ lookup('password', secret + '/' + 'fathom_admin_password length=32') }}"
8
3

+ 0
- 5
roles/common/defaults/main.yml View File

5 
 friendly_networks:
 5 
 friendly_networks:
6 
   - ""
 6 
   - ""
7
7
8 
-# pass
9 
-secret_root: '{{ inventory_dir | realpath }}'
10 
-secret_name: 'secret'
11 
-secret: '{{ secret_root + "/" + secret_name }}'
12 
-
13 
 db_admin_username: 'postgres'
 8 
 db_admin_username: 'postgres'
14 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
 9 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
15
10

+ 0
- 4
roles/gitea/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 gitea_subdomain: "git"
 1 
 gitea_subdomain: "git"
6 
 gitea_domain: "{{ gitea_subdomain }}.{{ domain }}"
 2 
 gitea_domain: "{{ gitea_subdomain }}.{{ domain }}"
7
3

+ 0
- 4
roles/iot/defaults/main.yml View File

6 
 mqtt_admin_version: '1.0.0'
 6 
 mqtt_admin_version: '1.0.0'
7 
 mqtt_admin_release: "https://github.com/hobbyquaker/mqtt-admin/releases/download/v{{ mqtt_admin_version }}/mqtt-admin_{{ mqtt_admin_version }}.zip"
 7 
 mqtt_admin_release: "https://github.com/hobbyquaker/mqtt-admin/releases/download/v{{ mqtt_admin_version }}/mqtt-admin_{{ mqtt_admin_version }}.zip"
8
8
9 
-secret_root: '{{ inventory_dir | realpath }}'
10 
-secret_name: 'secret'
11 
-secret: '{{ secret_root + "/" + secret_name }}'
12 
-
13 
 grafana_main_user: "{{ main_user_name }}"
 9 
 grafana_main_user: "{{ main_user_name }}"
14 
 grafana_main_user_password: "{{ lookup('password', secret + '/' + 'grafana_main_user_password length=20 chars=hexdigits') }}"
 10 
 grafana_main_user_password: "{{ lookup('password', secret + '/' + 'grafana_main_user_password length=20 chars=hexdigits') }}"
15
11

+ 0
- 4
roles/ircbouncer/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 irc_admin_username: "{{ main_user_name }}"
 1 
 irc_admin_username: "{{ main_user_name }}"
6 
 irc_admin_password: "{{ lookup('password', secret + '/' + 'irc_admin_password length=32') }}"
 2 
 irc_admin_password: "{{ lookup('password', secret + '/' + 'irc_admin_password length=32') }}"
7
3

+ 0
- 4
roles/mailserver/defaults/main.yml View File

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

+ 0
- 4
roles/mastodon/defaults/main.yml View File

5 
 rbenv_version: v1.1.1
 5 
 rbenv_version: v1.1.1
6 
 ruby_build_version: v20181225
 6 
 ruby_build_version: v20181225
7
7
8 
-secret_root: '{{ inventory_dir | realpath }}'
9 
-secret_name: 'secret'
10 
-secret: '{{ secret_root + "/" + secret_name }}'
11 
-
12 
 mastodon_db_username: mastodonuser
 8 
 mastodon_db_username: mastodonuser
13 
 mastodon_db_password: "{{ lookup('password', secret + '/' + 'mastodon_db_password length=32') }}"
 9 
 mastodon_db_password: "{{ lookup('password', secret + '/' + 'mastodon_db_password length=32') }}"
14 
 mastodon_db_database: mastodon
 10 
 mastodon_db_database: mastodon

+ 0
- 4
roles/matrix/defaults/main.yml View File

4 
 riot_version: "1.0.3"
 4 
 riot_version: "1.0.3"
5 
 riot_release: "https://github.com/vector-im/riot-web/releases/download/v{{ riot_version }}/riot-v{{ riot_version }}.tar.gz"
 5 
 riot_release: "https://github.com/vector-im/riot-web/releases/download/v{{ riot_version }}/riot-v{{ riot_version }}.tar.gz"
6
6
7 
-secret_root: '{{ inventory_dir | realpath }}'
8 
-secret_name: 'secret'
9 
-secret: '{{ secret_root + "/" + secret_name }}'
10 
-
11 
 synapse_admin: "{{ admin_email }}"
 7 
 synapse_admin: "{{ admin_email }}"
12 
 synapse_registration_secret: "{{ lookup('password', secret + '/' + 'synapse_registration_secret length=32 chars=ascii_letters,digits') }}"
 8 
 synapse_registration_secret: "{{ lookup('password', secret + '/' + 'synapse_registration_secret length=32 chars=ascii_letters,digits') }}"
13 
 synapse_pw_pepper: "{{ lookup('password', secret + '/' + 'synapse_pw_pepper length=32 chars=ascii_letters,digits') }}"
 9 
 synapse_pw_pepper: "{{ lookup('password', secret + '/' + 'synapse_pw_pepper length=32 chars=ascii_letters,digits') }}"

+ 0
- 4
roles/monitoring/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 # must match values in roles/common
 1 
 # must match values in roles/common
6 
 monit_admin_username: "{{ main_user_name }}"
 2 
 monit_admin_username: "{{ main_user_name }}"
7 
 monit_admin_password: "{{ lookup('password', secret + '/' + 'monit_admin_password length=16 chars=hexdigits') }}"
 3 
 monit_admin_password: "{{ lookup('password', secret + '/' + 'monit_admin_password length=16 chars=hexdigits') }}"

+ 0
- 4
roles/news/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 selfoss_subdomain: "news"
 1 
 selfoss_subdomain: "news"
6 
 selfoss_domain: "{{ selfoss_subdomain }}.{{ domain }}"
 2 
 selfoss_domain: "{{ selfoss_subdomain }}.{{ domain }}"
7
3

+ 0
- 4
roles/nextcloud/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 nextcloud_subdomain: "cloud"
 1 
 nextcloud_subdomain: "cloud"
6 
 nextcloud_domain: "{{ nextcloud_subdomain }}.{{ domain }}"
 2 
 nextcloud_domain: "{{ nextcloud_subdomain }}.{{ domain }}"
7
3

+ 0
- 5
roles/sslletsencrypt/defaults/main.yml View File

4 
 friendly_networks:
 4 
 friendly_networks:
5 
   - ""
 5 
   - ""
6
6
7 
-# pass
8 
-secret_root: '{{ inventory_dir | realpath }}'
9 
-secret_name: 'secret'
10 
-secret: '{{ secret_root + "/" + secret_name }}'
11 
-
12 
 db_admin_username: 'postgres'
 7 
 db_admin_username: 'postgres'
13 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
 8 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
14
9

+ 0
- 5
roles/sslselfsigned/defaults/main.yml View File

4 
 friendly_networks:
 4 
 friendly_networks:
5 
   - ""
 5 
   - ""
6
6
7 
-# pass
8 
-secret_root: '{{ inventory_dir | realpath }}'
9 
-secret_name: 'secret'
10 
-secret: '{{ secret_root + "/" + secret_name }}'
11 
-
12 
 db_admin_username: 'postgres'
 7 
 db_admin_username: 'postgres'
13 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
 8 
 db_admin_password: "{{ lookup('password', secret + '/' + 'db_admin_password length=32') }}"
14
9

+ 0
- 4
roles/webmail/defaults/main.yml View File

2 
 webmail_subdomain: "mail"
 2 
 webmail_subdomain: "mail"
3 
 webmail_domain: "{{ webmail_subdomain }}.{{ domain }}"
 3 
 webmail_domain: "{{ webmail_subdomain }}.{{ domain }}"
4 
 webmail_language: "en_US"
 4 
 webmail_language: "en_US"
5 
-
6 
-secret_root: '{{ inventory_dir | realpath }}'
7 
-secret_name: 'secret'
8 
-secret: '{{ secret_root + "/" + secret_name }}'

+ 0
- 4
roles/xmpp/defaults/main.yml View File

1 
-secret_root: '{{ inventory_dir | realpath }}'
2 
-secret_name: 'secret'
3 
-secret: '{{ secret_root + "/" + secret_name }}'
4 
-
5 
 prosody_admin: "{{ admin_email }}"
 1 
 prosody_admin: "{{ admin_email }}"
6 
 prosody_accounts:
 2 
 prosody_accounts:
7 
   - name: "{{ main_user_name }}"
 3 
   - name: "{{ main_user_name }}"

Write Preview
Loading…
Cancel
Save