From 2a3d56fddcc0243fe4947de1efc143d4b8a0c749 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 30 Mar 2023 11:00:21 +0200 Subject: [PATCH] Update to 2023-03-30 11:00 --- roles/matrix_element/defaults/main.yml | 4 ++-- roles/matrix_synapse/defaults/main.yml | 2 +- roles/vault/defaults/main.yml | 4 ++-- roles/wapt_server/defaults/main.yml | 3 +++ roles/wapt_server/meta/main.yml | 1 + roles/wapt_server/tasks/conf.yml | 14 ++++++++++++++ roles/wapt_server/templates/.rsyncd.conf.j2.swp | Bin 0 -> 12288 bytes roles/wapt_server/templates/rsyncd.conf.j2 | 10 ++++++++++ 8 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 roles/wapt_server/templates/.rsyncd.conf.j2.swp create mode 100644 roles/wapt_server/templates/rsyncd.conf.j2 diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml index 9919a55..928112c 100644 --- a/roles/matrix_element/defaults/main.yml +++ b/roles/matrix_element/defaults/main.yml @@ -5,8 +5,8 @@ element_id: element # Version to deploy, and expected sha256 -element_version: 1.11.25 -element_archive_sha256: 974877e5d8dc3f8919cd5101fc6f36fcd2145628bb917b48a6863213cee30ba6 +element_version: 1.11.26 +element_archive_sha256: 0821f96eafe0e46c15a9e0fadc6a4f4a185d77cde2c764f59b3a22403fefb0e6 # Where to install element element_root_dir: /opt/matrix/element diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index 44d4fd9..41cefc0 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -1,7 +1,7 @@ --- # Synapse version to deploy -synapse_version: '1.79.0' +synapse_version: '1.80.0' # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/vault/defaults/main.yml b/roles/vault/defaults/main.yml index a6f6fe4..b60179b 100644 --- a/roles/vault/defaults/main.yml +++ b/roles/vault/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of Vault to install -vault_version: 1.13.0 +vault_version: 1.13.1 # URL of the archive vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip # Expected sha256 of the archive -vault_archive_sha256: 69c1ce6dd383bb342c4f861a51a91413eb05e1324159e4395532e42a8a59af9d +vault_archive_sha256: cf1015d0b30806515120d4a86672ea77da1fb0559e3839ba88d8e02e94e796a6 # Root dir where Nomad will be installed vault_root_dir: /opt/vault diff --git a/roles/wapt_server/defaults/main.yml b/roles/wapt_server/defaults/main.yml index 5c6a99f..c92ec56 100644 --- a/roles/wapt_server/defaults/main.yml +++ b/roles/wapt_server/defaults/main.yml @@ -11,3 +11,6 @@ wapt_db_user: wapt # A random password is generated unless defined here # wapt_db_pass: SeCret +# WAPT Repo can be exposed with rsync to be mirrored. This is the rsync password needed to sync the repo +# If not defined, no password is required +# wapt_rsync_pass: Th3RsYncpAssw0rd diff --git a/roles/wapt_server/meta/main.yml b/roles/wapt_server/meta/main.yml index 9ef54d8..d38fa40 100644 --- a/roles/wapt_server/meta/main.yml +++ b/roles/wapt_server/meta/main.yml @@ -3,3 +3,4 @@ dependencies: - role: repo_wapt - role: postgresql_server when: wapt_db_server in ['localhost','127.0.0.1'] + - role: rsync_server diff --git a/roles/wapt_server/tasks/conf.yml b/roles/wapt_server/tasks/conf.yml index ce863c7..4dcc460 100644 --- a/roles/wapt_server/tasks/conf.yml +++ b/roles/wapt_server/tasks/conf.yml @@ -97,3 +97,17 @@ dest: /etc/nginx/conf.d/wapt.conf notify: restart nginx tags: wapt + +- name: Deploy rsync configuration + template: src=rsyncd.conf.j2 dest=/etc/rsyncd.conf.d/waptrepo.conf + tags: wapt + +- name: Deploy WAPT Repo rsync secret + copy: content=wapt:{{ wapt_rsync_pass }} dest=/opt/wapt/conf/rsync.secrets mode=400 + when: wapt_rsync_pass is defined + tags: wapt + +- name: Remove rsync secret + file: path=/opt/wapt/conf/rsync.secrets state=absent + when: wapt_rsync_pass is not defined + tags: wapt diff --git a/roles/wapt_server/templates/.rsyncd.conf.j2.swp b/roles/wapt_server/templates/.rsyncd.conf.j2.swp new file mode 100644 index 0000000000000000000000000000000000000000..f0c3c44cfaa4a528cdfcda0f74815c9b7e7b8dad GIT binary patch literal 12288 zcmeI&&ubGw6bJCv91B*d|G?DRqdQ4@@}O8sOFfiINcA8kOm<$(hRx1)X3`LB>tEnK zN1^{f@8118`ZoyPeVayv#6zx@@4#dB$D231AJ{|4>(<}DJytK1I>~rKG(CK7Z>C$d zuje(gUHj(XsNLGzKS=gZj;oA+j@*>dl`k6g-Guwmo0OB(4VP1|7Ygd&Q*DZnb#vC< zeM}5LiLr5$!e`vrm2d*_L{`dAh1_{^S@pS-RFX2YmiJkQd#5xZs4OVUy{uqc?cmv1<%)bFizXcCQ)cDJI~Qs6_fXpH rhg?Lt^I`8@TeY}!A&bsWs5G*xJlTcudORNMejMiXvD(v1(i!~*b!>l@ literal 0 HcmV?d00001 diff --git a/roles/wapt_server/templates/rsyncd.conf.j2 b/roles/wapt_server/templates/rsyncd.conf.j2 new file mode 100644 index 0000000..f08065d --- /dev/null +++ b/roles/wapt_server/templates/rsyncd.conf.j2 @@ -0,0 +1,10 @@ +[waptrepo] +path = /var/www/html +comment = WAPT Repository +uid = root +gid = root +read only = yes +{% if wapt_rsync_pass is defined %} +auth users = wapt +secrets file = /opt/wapt/conf/rsync.secrets +{% endif %}