Skip to content

Commit

Permalink
make linters happy
Browse files Browse the repository at this point in the history
  • Loading branch information
p-j-smith committed Dec 4, 2024
1 parent e79aae6 commit 94f469c
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion playbooks/group_vars/db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ postgresql_ssl_certificate:
csr_common_name: "{{ db_server.host }}"
certificate_filename: "{{ postgresql.base_directory }}/certs/server.crt"
provider: selfsigned
selfsigned_not_after: "+3650d"
selfsigned_not_after: +3650d
cache_filename: "{{ database_server_certificate_cache_filename }}" # where to store the server certificate in cache

firewalld_rich_rules:
Expand Down
2 changes: 1 addition & 1 deletion playbooks/group_vars/omero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ postgresql_client_ssl_certificate:
csr_common_name: "{{ web_server.host }}"
certificate_filename: /opt/omero/server/.postgresql/postgresql.crt
provider: selfsigned
selfsigned_not_after: "+3650d"
selfsigned_not_after: +3650d
cache_filename: "{{ database_client_certificate_cache_filename }}" # where to store the client certificate in cache

# firewalld
Expand Down
2 changes: 1 addition & 1 deletion playbooks/group_vars/xnat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ postgresql_client_ssl_certificate:
csr_common_name: "{{ web_server.host }}"
certificate_filename: /usr/share/tomcat/.postgresql/postgresql.crt
provider: selfsigned
selfsigned_not_after: "+3650d"
selfsigned_not_after: +3650d
cache_filename: "{{ database_client_certificate_cache_filename }}" # where to store the client certificate in cache

java:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ monitoring_server_ssl_certificate:
csr_common_name: "{{ hostvars['mserv']['hostname'] }}"
certificate_filename: /etc/ssl/certs/{{ hostvars['mserv']['hostname'] }}.cert
provider: selfsigned
selfsigned_not_after: "+3650d"
selfsigned_not_after: +3650d
4 changes: 2 additions & 2 deletions roles/nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ variables:
| ------------------------------- | ----------------------------------------------------------------------------------------- |
| `nginx_use_ssl` | Whether to use SSL. Defaults to `true` |
| `nginx_certs_dir` | Where to store the certificates. Defaults to `/etc/nginx/ssl` |
| `nginx_server_cert_cache` | Path to SSL certificates on the Ansible host. Required if using SSL; no default |
| `nginx_server_key_cache` | Path to SSL certificate on the Ansible host. Required if using SSL; no default |
| `nginx_server_cert_cache` | Path to SSL certificates on the Ansible host. Required if using SSL; no default |
| `nginx_server_key_cache` | Path to SSL certificate on the Ansible host. Required if using SSL; no default |
| `nginx_ssl_cert_file` | Path to copy the SSL certificate to. Defaults to `/etc/nginx/ssl/server.cert` |
| `nginx_ssl_key_file` | Path to copy the SSL key to. Defaults to `/etc/nginx/ssl/server.key` |
| `nginx_diffie_helman_size_bits` | Bit size for OpenSSL Diffie-Hellman Parameters. Defaults to `4096` |
Expand Down
4 changes: 2 additions & 2 deletions roles/nginx/molecule/resources/inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ nginx_old_ssl_certificate:
csr_common_name: "{{ nginx_server_name }}"
certificate_filename: "{{ nginx_server_cert_cache }}"
provider: selfsigned
selfsigned_not_after: "+365d"
selfsigned_not_after: +365d

nginx_new_ssl_certificate:
owner: "{{ nginx_owner }}"
Expand All @@ -36,4 +36,4 @@ nginx_new_ssl_certificate:
csr_common_name: "{{ nginx_server_name }}"
certificate_filename: "{{ nginx_ssl_cert_file }}"
provider: selfsigned
selfsigned_not_after: "+3650d"
selfsigned_not_after: +3650d
7 changes: 5 additions & 2 deletions roles/nginx/molecule/resources/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,15 @@
hosts: all
gather_facts: true
tasks:
- name: Create SSL certificate that expires in 1 year and store in server cache
- name:
Create SSL certificate that expires in 1 year and store in server cache
ansible.builtin.include_role:
name: mirsg.infrastructure.ssl_certificates
vars:
ssl_certificate: "{{ nginx_old_ssl_certificate }}" # noqa: var-naming[no-role-prefix]
- name: Create SSL certificate that expires in 10 years and store in nginx certificate directory
- name:
Create SSL certificate that expires in 10 years and store in nginx
certificate directory
ansible.builtin.include_role:
name: mirsg.infrastructure.ssl_certificates
vars:
Expand Down

0 comments on commit 94f469c

Please sign in to comment.