jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-04 12:23:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2024-02-21 16:00

Browse Source
This commit is contained in:
Daniel Berteaud 2024-02-21 16:00:39 +01:00
parent 591a80926b
commit 7d5e3cf033
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/consul_template/defaults/main.yml
View File

@ -1,11 +1,11 @@
---
# Version of consul-template to install
consul_tpl_version: 0.36.0
consul_tpl_version: 0.37.0
# URL of the archive
consul_tpl_archive_url: https://releases.hashicorp.com/consul-template/{{ consul_tpl_version }}/consul-template_{{ consul_tpl_version }}_linux_amd64.zip
# Expected sha256 of the archive
consul_tpl_archive_sha256: 9844aebb997b81dd5b58a6ddadbf650eca4b200ccbc2ad680d817528a73c0d3a
consul_tpl_archive_sha256: 4695bf2c316d771f4574a1347bcdbe230f3c30f3b0c16faad2eaaa7797b73ae9
# Root dir where consul-template will be installed
consul_tpl_root_dir: /opt/consul_template

4
roles/etherpad/defaults/main.yml
View File

@ -8,11 +8,11 @@ etherpad_root_dir: /opt/etherpad_{{ etherpad_id }}
# Unix account under which etherpad will run. The user will be created if it doesn't exist
etherpad_user: etherpad_{{ etherpad_id }}
# Version to deploy
etherpad_version: 1.9.6
etherpad_version: 1.9.7
# URL from where the archive will be downloaded
etherpad_archive_url: https://github.com/ether/etherpad-lite/archive/{{ etherpad_version }}.tar.gz
# Expected sha256 of the archive, to check the download were OK
etherpad_archive_sha256: cd0cb2c9c2c4a8f93972b3f5913ff00cd3733c732195df293c8f56f3ce0a018f
etherpad_archive_sha256: ea93e432f811c6a7e88f5eeb04c3c6fa5440df00a000d26cccbf9ea1b7217375
# Port on which the service will listen
etherpad_port: 9003
# List of IP/CIDR for which the port will be opened (if iptables_manage == True)

6
roles/letsencrypt/tasks/main.yml
View File

@ -12,12 +12,6 @@
package: name={{ letsencrypt_packages }}
tags: web,ssl
- name: Detect openssl version
shell: openssl version | perl -ne 'm/OpenSSL (\d+[^\s\-]+)/ && print "$1\n"'
register: letsencrypt_openssl_version
changed_when: False
tags: web,ssl
- name: Create needed directories
file: path={{ item }} state=directory
with_items:

4
roles/letsencrypt/templates/config.j2
View File

@ -10,9 +10,7 @@ KEYSIZE="{{ letsencrypt_key_size | default('4096') }}"
HOOK=/usr/{{ (ansible_os_family == 'Debian') | ternary('local/','') }}bin/dehydrated_hooks
RENEW_DAYS="{{ letsencrypt_renew_days | default('30') }}"
PRIVATE_KEY_RENEW="yes"
{% if letsencrypt_preferred_chain is not defined %}
PREFERRED_CHAIN="{{ letsencrypt_openssl_version.stdout is version('1.0.2k', '>=') | ternary('ISRG Root X1','issuer= /C=US/O=Internet Security Research Group/CN=ISRG Root X1') }}"
{% elif letsencrypt_preferred_chain != 'default' %}
{% if letsencrypt_preferred_chain is defined and letsencrypt_preferred_chain != 'default' %}
PREFERRED_CHAIN={{ letsencrypt_preferred_chain | quote }}
{% endif %}
{% if letsencrypt_key_algo | default('rsa') in ['rsa', 'prime256v1', 'secp384r1' ] %}