update(server): bump version to 24.0.2

fix(nginx-fpm-proxy): compare fpm_socket against strings not sequences
chore(nginx-fpm-proxy): allow specifying multiple sockets as upstreams
2022-07-17 16:04:55 +02:00 · 2022-06-19 14:34:20 +02:00 · 2022-05-29 09:48:25 +02:00 · 2022-05-29 09:47:40 +02:00 · 2022-05-29 09:46:58 +02:00 · 2022-04-03 14:42:06 +02:00
4 changed files with 9 additions and 3 deletions
--- a/galaxy.yml
+++ b/galaxy.yml
@ -1,6 +1,6 @@
 namespace: finallycoffee
 name: nextcloud
-version: 0.4.0
+version: 0.5.0
 readme: README.md
 authors:
 - Johanna Dorothea Reichmann <transcaffeine@finallycoffee.eu>
--- a/roles/nginx-fpm-proxy/templates/nextcloud-nginx.conf.j2
+++ b/roles/nginx-fpm-proxy/templates/nextcloud-nginx.conf.j2
@ -1,6 +1,12 @@
 upstream php-handler {
 {% if fpm_socket %}
+{% if fpm_socket is not string %}
+{% for upstream in fpm_socket %}
+    server unix:{{ upstream }};
+{% endfor %}
+{% else %}
    server unix:{{ fpm_socket }};
+{% endif %}
 {% else %}
    server {{ fpm_server }}:{{ fpm_server_port }};
 {% endif %}
--- a/roles/server/defaults/main.yml
+++ b/roles/server/defaults/main.yml
@ -1,6 +1,6 @@
 ---

-nextcloud_version: 23.0.0
+nextcloud_version: 24.0.2
 nextcloud_user: nextcloud
 nextcloud_basepath: /opt/nextcloud
 nextcloud_config_path: "{{ nextcloud_basepath }}/config"
--- a/roles/server/templates/nextcloud-fpm.ini.j2
+++ b/roles/server/templates/nextcloud-fpm.ini.j2
@ -4,7 +4,7 @@ user = www-data
 group = www-data

 {% if nextcloud_socket_path is defined and nextcloud_socket_path is string %}
-listen = {{ nextcloud_container_php_socket_path }}/nextcloud.sock
+listen = {{ nextcloud_container_php_socket_path }}/{{ nextcloud_container_name }}.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0666
Author	SHA1	Message	Date
Johanna Dorothea Reichmann	f465c5d792	update(server): bump version to 24.0.2	2022-07-17 16:04:55 +02:00
Johanna Dorothea Reichmann	29a145fe42	fix(nginx-fpm-proxy): compare fpm_socket against strings not sequences	2022-06-19 14:34:20 +02:00
Johanna Dorothea Reichmann	f27abe9e42	chore(nginx-fpm-proxy): allow specifying multiple sockets as upstreams	2022-05-29 09:48:25 +02:00
Johanna Dorothea Reichmann	e76e4beac0	chore(server): name socket after container name	2022-05-29 09:47:40 +02:00
Johanna Dorothea Reichmann	b40bd1a383	update(server): bump version to 24.0.1	2022-05-29 09:46:58 +02:00
Johanna Dorothea Reichmann	6acf6314eb	update(server): bump version to 23.0.3	2022-04-03 14:42:06 +02:00
Johanna Dorothea Reichmann	3e5ad9ac5d	chore: bump version to 0.5.0	2021-12-12 18:31:53 +01:00