feat(nginx-fpm-proxy): add ansible role for nginx-based frontend proxy

README.md

@@ -15,7 +15,7 @@ and managing nextcloud installations
   server instance. Can install, remove, enable/disable and update apps.
 - [`roles/ldap-user-backend`](roles/ldap-user-backend/README.md):
   Manages LDAP authentication sources in installed nextcloud instances.
-- [`roles/nginx-fpm-proxy`](roles/nginx-fpm-proxy/README.md):
+- [`roles/nginx-fpm-proxy`](roles/nginx-fpm-proxy/README.me):
   Reverse proxy role which connects to nextcloud using FPM
   and serves static content.
 

galaxy.yml

@@ -1,14 +1,15 @@
 namespace: finallycoffee
 name: nextcloud
-version: 0.5.1
+version: 0.4.0
 readme: README.md
 authors:
-- transcaffeine <transcaffeine@finally.coffee>
+- Johanna Dorothea Reichmann <transcaffeine@finallycoffee.eu>
 description: Installing and configuring nextcloud (and related apps/services) using docker
 dependencies:
   "community.docker": "^1.10.0"
-license_file: LICENSE.md
+license:
+- CNPLv7+
 build_ignore:
 - '*.tar.gz'
-repository: https://git.finally.coffee/finallycoffee/nextcloud
-issues: https://git.finally.coffee/finallycoffee/nextcloud/issues
+repository: https://git.finallycoffee.eu/finallycoffee.eu/nextcloud
+issues: https://git.finallycoffee.eu/finallycoffee.eu/nextcloud/issues

meta/runtime.yml

@@ -1,3 +0,0 @@
----
-
-requires_ansible: ">=2.12"

roles/nginx-fpm-proxy/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-nextcloud_nginx_version: "1.23.3"
+nextcloud_nginx_version: "1.21.3"
 nextcloud_nginx_basepath: /opt/nextcloud-nginx
 nextcloud_nginx_config: "{{ nextcloud_nginx_basepath }}/nextcloud.conf"
 nextcloud_nginx_servernames: ~

roles/nginx-fpm-proxy/templates/nextcloud-nginx.conf.j2

@@ -1,12 +1,6 @@
 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 %}

roles/server/README.md

@@ -12,10 +12,3 @@ so the host file permissions remain comprehensible.
 - `nextcloud_socket_path`: Setting this (to, for example, `{{ nextcloud_basepath }}/socket`),
   will make FPM listen on `{{ nextcloud_socket_path }}/nextcloud.sock` on the host, enabling
   you to use FPM to interface with nextcloud.
-
-### Redis over UNIX-Socket
-
-Set `REDIS_HOST` to a path in the container where the socket is mapped using
-`nextcloud_container_extra_environment`. Also set `REDIS_HOST_PORT` to 0
-explicitely, as `redis.config.php` will set it to `null` otherwise, resulting
-in an exception. Set your redis password in `REDIS_HOST_PASSWORD`.

roles/server/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-nextcloud_version: 27.1.6
+nextcloud_version: 22.2.0
 nextcloud_user: nextcloud
 nextcloud_basepath: /opt/nextcloud
 nextcloud_config_path: "{{ nextcloud_basepath }}/config"
@@ -46,19 +46,19 @@ nextcloud_container_purge_other_networks: true
 nextcloud_paths:
   - path: "{{ nextcloud_config_path }}"
     mode: "0755"
-    owner: "{{ nextcloud_user_info.uid | default(nextcloud_user) }}"
-    group: root
+    owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
+    group: "root"
   - path: "{{ nextcloud_data_path }}"
     mode: "0755"
-    owner: "{{ nextcloud_user_info.uid | default(nextcloud_user) }}"
-    group: "{{ nextcloud_user_info.group | default(nextcloud_user) }}"
+    owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
+    group: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
   - path: "{{ nextcloud_fpm_config_path }}"
     mode: "0750"
     owner: root
     group: root
   - path: "{{ nextcloud_storage_path }}"
     mode: "0770"
-    owner: "{{ nextcloud_user_info.uid | default(nextcloud_user) }}"
+    owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
     group: "root"
 
 # PHP OpCache tuning

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_container_name }}.sock
+listen = {{ nextcloud_container_php_socket_path }}/nextcloud.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0666