Browse Source

Merge pull request #1298 from GoMatrixHosting/gomatrixhosting-testing

GoMatrixHosting v0.6.0
pull/1299/head
Slavi Pantaleev 4 years ago
committed by GitHub
parent
commit
62ce06e28c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 4 deletions
  1. +1
    -1
      docs/configuring-awx-system.md
  2. +10
    -1
      roles/matrix-awx/tasks/main.yml
  3. +0
    -1
      roles/matrix-awx/tasks/rename_variables.yml
  4. +15
    -0
      roles/matrix-awx/tasks/rotate_ssh.yml
  5. +1
    -1
      setup.yml

+ 1
- 1
docs/configuring-awx-system.md View File

@@ -26,7 +26,7 @@ The following repositories allow you to copy and use this setup:

Updates to this section are trailed here:

[GoMatrixHosting Matrix Docker Ansible Deploy](https://gitlab.com/GoMatrixHosting/gomatrixhosting-matrix-docker-ansible-deploy)
[GoMatrixHosting Matrix Docker Ansible Deploy](https://gitlab.com/GoMatrixHosting/matrix-docker-ansible-deploy)


## Does I need an AWX setup to use this? How do I configure it?


+ 10
- 1
roles/matrix-awx/tasks/main.yml View File

@@ -25,7 +25,7 @@
when: run_setup|bool and matrix_awx_enabled|bool
tags:
- backup-server
# Perform a export of the server
- include_tasks:
file: "export_server.yml"
@@ -62,6 +62,15 @@
tags:
- purge-database

# Rotate SSH key if called
- include_tasks:
file: "rotate_ssh.yml"
apply:
tags: rotate-ssh
when: run_setup|bool and matrix_awx_enabled|bool
tags:
- rotate-ssh

# Import configs, media repo from /chroot/backup import
- include_tasks:
file: "import_awx.yml"


+ 0
- 1
roles/matrix-awx/tasks/rename_variables.yml View File

@@ -5,4 +5,3 @@
path: "/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml"
regexp: 'matrix_synapse_use_presence'
replace: 'matrix_synapse_presence_enabled'


+ 15
- 0
roles/matrix-awx/tasks/rotate_ssh.yml View File

@@ -0,0 +1,15 @@

- name: Set the new authorized key taken from file
authorized_key:
user: root
state: present
exclusive: yes
key: "{{ lookup('file', '/var/lib/awx/projects/hosting/client_public.key') }}"

- name: Set boolean value to exit playbook
set_fact:
end_playbook: true

- name: End playbook if this task list is called.
meta: end_play
when: end_playbook is defined and end_playbook|bool

+ 1
- 1
setup.yml View File

@@ -56,4 +56,4 @@
- matrix-aux
- matrix-postgres-backup
- matrix-prometheus-postgres-exporter
- matrix-common-after
- matrix-common-after

Loading…
Cancel
Save