diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index d10b67f..9631977 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -gitea_version: '1.22.4' +gitea_version: '1.22.6' # URL to the binary gitea_bin_url: https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64 # sha256 of the binary -gitea_bin_sha256: d549104f55067e6fb156e7ba060c9af488f36e12d5e747db7563fcc99eaf8532 +gitea_bin_sha256: fd77f1a0273c85a0950207c1cfa6753a9fa57604e4ab1382484b191cc919ce15 # Handle updates. If set to false, ansible will only install # Gitea and then won't touch an existing installation gitea_manage_upgrade: True diff --git a/roles/mysql_server/templates/dehydrated_hook.j2 b/roles/mysql_server/templates/dehydrated_hook.j2 index 995adb6..568689b 100644 --- a/roles/mysql_server/templates/dehydrated_hook.j2 +++ b/roles/mysql_server/templates/dehydrated_hook.j2 @@ -2,9 +2,9 @@ {% if mysql_letsencrypt_cert is defined %} -if [ $1 == "{{ pg_letsencrypt_cert }}" ]; then - cp /var/lib/dehydrated/certificates/certs/{{ mysql_letsencrypt_cert }}/fullchain.pem /etc/my.ssl/server.crt - cp /var/lib/dehydrated/certificates/certs/{{ mysql_letsencrypt_cert }}/privkey.pem /etc/my.ssl/server.key +if [ $1 == "{{ mysql_letsencrypt_cert | split | first }}" ]; then + cp /var/lib/dehydrated/certificates/certs/{{ mysql_letsencrypt_cert | split | first }}/fullchain.pem /etc/my.ssl/server.crt + cp /var/lib/dehydrated/certificates/certs/{{ mysql_letsencrypt_cert | split | first }}/privkey.pem /etc/my.ssl/server.key chown root:mysql /etc/my.ssl/server.key chown root:root /etc/my.ssl/server.crt chmod 640 /etc/my.ssl/server.key diff --git a/roles/postgresql_server/templates/dehydrated_hook.j2 b/roles/postgresql_server/templates/dehydrated_hook.j2 index 9fba754..729bd00 100644 --- a/roles/postgresql_server/templates/dehydrated_hook.j2 +++ b/roles/postgresql_server/templates/dehydrated_hook.j2 @@ -2,9 +2,9 @@ {% if pg_letsencrypt_cert is defined %} -if [ $1 == "{{ pg_letsencrypt_cert }}" ]; then - cp /var/lib/dehydrated/certificates/certs/{{ pg_letsencrypt_cert }}/fullchain.pem /var/lib/pgsql/ssl/server.crt - cp /var/lib/dehydrated/certificates/certs/{{ pg_letsencrypt_cert }}/privkey.pem /var/lib/pgsql/ssl/server.key +if [ $1 == "{{ pg_letsencrypt_cert | split | first }}" ]; then + cp /var/lib/dehydrated/certificates/certs/{{ pg_letsencrypt_cert | split | first }}/fullchain.pem /var/lib/pgsql/ssl/server.crt + cp /var/lib/dehydrated/certificates/certs/{{ pg_letsencrypt_cert | split | first }}/privkey.pem /var/lib/pgsql/ssl/server.key chown root:postgres /var/lib/pgsql/ssl/server.key chown root:root /var/lib/pgsql/ssl/server.crt chmod 640 /var/lib/pgsql/ssl/server.key