roles/server/README.md

@@ -6,9 +6,3 @@ regardless of wether the `apache` or `fpm` docker image is used.
 It provides various common (optimization) configuration options
 and creates a user on the host which is mapped into the container,
 so the host file permissions remain comprehensible.
-
-## Configuration
-
-- `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.

roles/server/defaults/main.yml

@@ -9,7 +9,6 @@ nextcloud_data_path: "{{ nextcloud_basepath }}/data"
 # Where user data like media, documents etc are persisted
 nextcloud_storage_path: "{{ nextcloud_basepath }}/storage"
 nextcloud_fpm_config_path: "{{ nextcloud_basepath }}/fpm-config"
-#nextcloud_socket_path: "{{ nextcloud_basepath }}/socket"
 
 nextcloud_background_job_mode: cron
 
@@ -33,7 +32,6 @@ nextcloud_container_base_volumes:
   - "{{ nextcloud_data_path }}:/var/www/html:z"
   - "{{ nextcloud_fpm_config_path }}/opcache.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini:z"
   - "{{ nextcloud_fpm_config_path }}/fpm.ini:/usr/local/etc/php-fpm.d/www.conf:z"
-  - "{{ nextcloud_fpm_config_path }}/fpm-docker.ini:/usr/local/etc/php-fpm.d/zz-docker.conf:z"
   - "{{ nextcloud_basepath }}/nextcloud-passwd:/etc/passwd:z"
   - "{{ nextcloud_basepath }}/nextcloud-group:/etc/group:z"
 nextcloud_container_extra_volumes: []

roles/server/tasks/main.yml

@@ -7,19 +7,6 @@
     system: yes
   register: nextcloud_user_info
 
-- name: Map nextcloud socket path if defined
-  set_fact:
-    nextcloud_paths: "{{ nextcloud_paths + [ socket_dir ] }}"
-    nextcloud_container_base_volumes: "{{ nextcloud_container_base_volumes + [ socket_map ] }}"
-  vars:
-    socket_dir:
-      path: "{{ nextcloud_socket_path }}"
-      mode: "0755"
-      owner: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
-      group: "{{ nextcloud_user_info.uid|default(nextcloud_user) }}"
-    socket_map: "{{ nextcloud_socket_path }}:{{ nextcloud_container_php_socket_path }}:z"
-  when: nextcloud_socket_path is defined and nextcloud_socket_path is string
-
 - name: Ensure nextcloud directories exist and have correct permissions
   file:
     path: "{{ item.path }}"
@@ -56,16 +43,6 @@
   notify:
     - reload-nextcloud
 
-- name: Template PHP FPM docker-specific configuration
-  template:
-    src: nextcloud-fpm-docker.ini.j2
-    dest: "{{ nextcloud_fpm_config_path }}/fpm-docker.ini"
-    mode: "0640"
-    owner: "root"
-    group: "root"
-  notify:
-    - reload-nextcloud
-
 - name: Template modified /etc/passwd for nextcloud container
   template:
     src: nextcloud-passwd.j2
@@ -108,8 +85,7 @@
   notify:
     - reload-systemd
 
-- name: Flush handlers now to ensure systemd can know about the timer before it's enabled
-  meta: flush_handlers
+- meta: flush_handlers
 
 - name: Ensure docker container for nextcloud is running
   docker_container:
@@ -162,7 +138,6 @@
     user: "{{ nextcloud_user_info.uid }}"
     tty: yes
   register: nextcloud_current_dbhost
-  changed_when: false
 
 - name: Set nextcloud database host mode to {{ nextcloud_database_host }}
   community.docker.docker_container_exec:

roles/server/templates/nextcloud-fpm-docker.ini.j2

@@ -1,2 +0,0 @@
-[global]
-daemonize = no

roles/server/templates/nextcloud-fpm.ini.j2

@@ -3,14 +3,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.owner = www-data
-listen.group = www-data
-listen.mode = 0666
-{% else %}
-;listen = 0.0.0.0:9000
-{% endif %}
+listen = 127.0.0.1:9000
 
 pm = dynamic
 pm.max_children = {{ nextcloud_fpm_max_children }}

roles/server/vars/main.yml

@@ -26,4 +26,3 @@ nextcloud_container_base_environment_yaml: |+2
   PHP_UPLOAD_LIMIT: "{{ nextcloud_php_upload_limit }}"
 
 nextcloud_occ_command: "php occ"
-nextcloud_container_php_socket_path: /var/run/php