Skip to content

Commit 3ee7deb

Browse files
committed
Rename variable (matrix_user_groupname -> matrix_group_name)
1 parent 9fc5cda commit 3ee7deb

File tree

89 files changed

+279
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+279
-278
lines changed

docs/configuring-playbook-bridge-hookshot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ aux_file_definitions:
127127
content: "{{ lookup('file', '/path/to/your-github-private-key.pem') }}"
128128
mode: '0400'
129129
owner: "{{ matrix_user_name }}"
130-
group: "{{ matrix_user_groupname }}"
130+
group: "{{ matrix_group_name }}"
131131
```
132132
133133
For more information, see the documentation in the [default configuration of the aux role](https://github.com/mother-of-all-self-hosting/ansible-role-aux/blob/main/defaults/main.yml).

docs/configuring-playbook-sygnal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ aux_file_definitions:
5050
here
5151
mode: '0600'
5252
owner: "{{ matrix_user_name }}"
53-
group: "{{ matrix_user_groupname }}"
53+
group: "{{ matrix_group_name }}"
5454
```
5555
5656
Configuring [GCM/FCM](https://firebase.google.com/docs/cloud-messaging/) is easier, as it only requires that you provide some config values.

group_vars/matrix_servers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ matrix_federation_traefik_entrypoint_tls: "{{ traefik_config_entrypoint_web_secu
7474
########################################################################
7575

7676
aux_directory_default_owner: "{{ matrix_user_name }}"
77-
aux_directory_default_group: "{{ matrix_user_groupname }}"
77+
aux_directory_default_group: "{{ matrix_group_name }}"
7878

7979
aux_file_default_owner: "{{ matrix_user_name }}"
80-
aux_file_default_group: "{{ matrix_user_groupname }}"
80+
aux_file_default_group: "{{ matrix_group_name }}"
8181

8282
########################################################################
8383
# #

roles/custom/matrix-alertmanager-receiver/tasks/install.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
state: directory
1212
mode: 0750
1313
owner: "{{ matrix_user_name }}"
14-
group: "{{ matrix_user_groupname }}"
14+
group: "{{ matrix_group_name }}"
1515
with_items:
1616
- path: "{{ matrix_alertmanager_receiver_base_path }}"
1717
when: true
@@ -27,15 +27,15 @@
2727
dest: "{{ matrix_alertmanager_receiver_config_path }}/config.yml"
2828
mode: 0644
2929
owner: "{{ matrix_user_name }}"
30-
group: "{{ matrix_user_groupname }}"
30+
group: "{{ matrix_group_name }}"
3131

3232
- name: Ensure matrix-alertmanager-receiver support files installed
3333
ansible.builtin.template:
3434
src: "{{ role_path }}/templates/{{ item }}.j2"
3535
dest: "{{ matrix_alertmanager_receiver_base_path }}/{{ item }}"
3636
mode: 0640
3737
owner: "{{ matrix_user_name }}"
38-
group: "{{ matrix_user_groupname }}"
38+
group: "{{ matrix_group_name }}"
3939
with_items:
4040
- labels
4141

roles/custom/matrix-appservice-double-puppet/tasks/install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
state: directory
1111
mode: 0750
1212
owner: "{{ matrix_user_name }}"
13-
group: "{{ matrix_user_groupname }}"
13+
group: "{{ matrix_group_name }}"
1414
with_items:
1515
- path: "{{ matrix_appservice_double_puppet_base_path }}"
1616
when: true
@@ -24,4 +24,4 @@
2424
dest: "{{ matrix_appservice_double_puppet_config_path }}/registration.yaml"
2525
mode: 0644
2626
owner: "{{ matrix_user_name }}"
27-
group: "{{ matrix_user_groupname }}"
27+
group: "{{ matrix_group_name }}"

roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
state: directory
1818
mode: 0750
1919
owner: "{{ matrix_user_name }}"
20-
group: "{{ matrix_user_groupname }}"
20+
group: "{{ matrix_group_name }}"
2121
with_items:
2222
- {path: "{{ matrix_appservice_draupnir_for_all_base_path }}", when: true}
2323
- {path: "{{ matrix_appservice_draupnir_for_all_config_path }}", when: true}
@@ -65,23 +65,23 @@
6565
dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/production-appservice.yaml"
6666
mode: 0644
6767
owner: "{{ matrix_user_name }}"
68-
group: "{{ matrix_user_groupname }}"
68+
group: "{{ matrix_group_name }}"
6969

7070
- name: Ensure matrix-appservice-draupnir-for-all bot config installed
7171
ansible.builtin.copy:
7272
content: "{{ matrix_appservice_draupnir_for_all_configuration | to_nice_yaml(indent=2, width=999999) }}"
7373
dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/production-bots.yaml"
7474
mode: 0644
7575
owner: "{{ matrix_user_name }}"
76-
group: "{{ matrix_user_groupname }}"
76+
group: "{{ matrix_group_name }}"
7777

7878
- name: Ensure matrix-appservice-draupnir-for-all registration.yaml installed
7979
ansible.builtin.copy:
8080
content: "{{ matrix_appservice_draupnir_for_all_registration | to_nice_yaml(indent=2, width=999999) }}"
8181
dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/draupnir-for-all-registration.yaml"
8282
mode: 0644
8383
owner: "{{ matrix_user_name }}"
84-
group: "{{ matrix_user_groupname }}"
84+
group: "{{ matrix_group_name }}"
8585

8686
- name: Ensure matrix-appservice-draupnir-for-all container network is created
8787
community.general.docker_network:

roles/custom/matrix-authentication-service/tasks/install.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
state: directory
1111
mode: 0750
1212
owner: "{{ matrix_user_name }}"
13-
group: "{{ matrix_user_groupname }}"
13+
group: "{{ matrix_group_name }}"
1414
with_items:
1515
- {path: "{{ matrix_authentication_service_base_path }}", when: true}
1616
- {path: "{{ matrix_authentication_service_bin_path }}", when: true}
@@ -39,15 +39,15 @@
3939
dest: "{{ matrix_authentication_service_config_path }}/config.yaml"
4040
mode: 0644
4141
owner: "{{ matrix_user_name }}"
42-
group: "{{ matrix_user_groupname }}"
42+
group: "{{ matrix_group_name }}"
4343

4444
- name: Ensure Matrix Authentication Service support files created
4545
ansible.builtin.template:
4646
src: "{{ item.src }}"
4747
dest: "{{ item.dest }}"
4848
mode: "{{ item.mode }}"
4949
owner: "{{ matrix_user_name }}"
50-
group: "{{ matrix_user_groupname }}"
50+
group: "{{ matrix_group_name }}"
5151
with_items:
5252
- src: "{{ role_path }}/templates/env.j2"
5353
dest: "{{ matrix_authentication_service_config_path }}/env"

roles/custom/matrix-base/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ matrix_container_global_registry_prefix_override: ""
177177

178178
matrix_user_name: "matrix"
179179
matrix_user_system: true
180-
matrix_user_groupname: "matrix"
180+
matrix_group_name: "matrix"
181181
matrix_group_system: true
182182

183183
# By default, the playbook creates the user (`matrix_user_name`)
184-
# and group (`matrix_user_groupname`) with a random ID.
184+
# and group (`matrix_group_name`) with a random ID.
185185
# To use a specific user/group ID, override these variables.
186186
matrix_user_uid: ~
187187
matrix_user_gid: ~

roles/custom/matrix-base/tasks/setup_matrix_base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
state: directory
1919
mode: "{{ matrix_base_data_path_mode }}"
2020
owner: "{{ matrix_user_name }}"
21-
group: "{{ matrix_user_groupname }}"
21+
group: "{{ matrix_group_name }}"
2222
with_items:
2323
- "{{ matrix_base_data_path }}"
2424
- "{{ matrix_bin_path }}"

roles/custom/matrix-base/tasks/setup_matrix_user.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
- name: Ensure Matrix group is created
99
ansible.builtin.group:
10-
name: "{{ matrix_user_groupname }}"
10+
name: "{{ matrix_group_name }}"
1111
gid: "{{ omit if matrix_user_gid is none else matrix_user_gid }}"
1212
state: present
1313
system: "{{ matrix_group_system }}"
@@ -18,7 +18,7 @@
1818
name: "{{ matrix_user_name }}"
1919
uid: "{{ omit if matrix_user_uid is none else matrix_user_uid }}"
2020
state: present
21-
group: "{{ matrix_user_groupname }}"
21+
group: "{{ matrix_group_name }}"
2222
home: "{{ matrix_base_data_path }}"
2323
create_home: false
2424
system: "{{ matrix_user_system }}"

0 commit comments

Comments
 (0)