Nextcloud: Upgrade backend to PHP7.4.

4 files changed, 16 insertions, 16 deletions

diff --git a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
index e8820ca..2abce2d 100644
--- a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
+++ b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
@@ -53,41 +53,41 @@ server {
     # Enable gzip but do not remove ETag headers
     gzip on;
     gzip_vary on;
     gzip_comp_level 4;
     gzip_min_length 256;
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
     gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
     location = / { return 303 /apps/files/; }
     location   / { rewrite ^ /index.php$uri last; }
 
     location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { internal; }
     location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)         { internal; }
 
     location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|core/templates/40[34])\.php(?:$|/) {
         include snippets/fastcgi-php.conf;
         fastcgi_param modHeadersAvailable     true;
         fastcgi_param front_controller_active true;
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
-        fastcgi_pass  unix:/run/php/php7.3-fpm@nextcloud.sock;
+        fastcgi_pass  unix:/run/php/php7.4-fpm@nextcloud.sock;
     }
 
     location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
         try_files $uri/ =404;
         index index.php;
     }
 
     location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
         expires 30d;
         try_files $uri /index.php$uri$is_args$args;
     }
 
     location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
         try_files $uri /index.php$uri$is_args$args;
     }
 
     location = /core/img/favicon.ico {
         alias /var/www/nextcloud/fripost.ico;
     }
 }
diff --git a/roles/nextcloud/files/etc/php/fpm/pool.d/nextcloud.conf b/roles/nextcloud/files/etc/php/fpm/pool.d/nextcloud.conf
index eb92adb..001ebf8 100644
--- a/roles/nextcloud/files/etc/php/fpm/pool.d/nextcloud.conf
+++ b/roles/nextcloud/files/etc/php/fpm/pool.d/nextcloud.conf
@@ -1,24 +1,24 @@
 [nextcloud]
 user = _nextcloud
 group = nogroup
-listen = /run/php/php7.3-fpm@nextcloud.sock
+listen = /run/php/php7.4-fpm@nextcloud.sock
 listen.owner = www-data
 listen.group = www-data
 listen.mode = 0600
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
 
 php_value[upload_max_filesize] = 512M
 php_value[post_max_size]       = 512M
 php_value[memory_limit]        = 512M
 
 php_admin_value[open_basedir] = /usr/local/share/nextcloud:/var/www/nextcloud:/mnt/nextcloud-data:/etc/nextcloud:/var/cache/nextcloud:/var/log/nextcloud:/usr/share/php:/tmp:/dev
 
 env[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/bin:/bin
 env[TMP] = /tmp
 env[TMPDIR] = /tmp
 env[TEMP] = /tmp
diff --git a/roles/nextcloud/handlers/main.yml b/roles/nextcloud/handlers/main.yml
index 1e48524..2fdd8b7 100644
--- a/roles/nextcloud/handlers/main.yml
+++ b/roles/nextcloud/handlers/main.yml
@@ -1,9 +1,9 @@
 ---
-- name: Restart php7.3-fpm
-  service: name=php7.3-fpm state=restarted
+- name: Restart php7.4-fpm
+  service: name=php7.4-fpm state=restarted
 
 - name: Restart Redis
   service: name=redis-server state=restarted
 
 - name: Restart Nginx
   service: name=nginx state=restarted
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 4c049a9..9a0a47a 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -2,76 +2,76 @@
   apt: pkg={{ packages }}
   vars:
     packages:
     - php-cli
     - php-bcmath
     - php-fpm
     - php-apcu
     - php-gd
     - php-gmp
     - php-imagick
     - php-mbstring
     - php-xml
     - php-curl
     - php-intl
     - php-ldap
     - php-mysql
     - php-zip
     - php-json
     - php-gmp
 
-- name: Configure PHP 7.3 Zend opcache
-  lineinfile: dest=/etc/php/7.3/fpm/php.ini
+- name: Configure PHP 7.4 Zend opcache
+  lineinfile: dest=/etc/php/7.4/fpm/php.ini
               regexp='^;?{{ item.var }}\\s*='
               line="{{ item.var }} = {{ item.value }}"
               owner=root group=root
               mode=0644
   with_items:
     - { var: opcache.memory_consumption,      value: 512 }
     - { var: opcache.revalidate_freq,         value: 180 }
   notify:
-    - Restart php7.3-fpm
+    - Restart php7.4-fpm
 
 - name: Create '_nextcloud' user
   user: name=_nextcloud system=yes
         group=nogroup
         createhome=no
         home=/nonexistent
         shell=/usr/sbin/nologin
         password=!
         state=present
 
-- name: Delete PHP 7.3 FPM's www pool
-  file: path=/etc/php/7.3/fpm/pool.d/www.conf state=absent
+- name: Delete PHP 7.4 FPM's www pool
+  file: path=/etc/php/7.4/fpm/pool.d/www.conf state=absent
   notify:
-    - Restart php7.3-fpm
+    - Restart php7.4-fpm
 
-- name: Configure PHP 7.3 FPM's nextcloud pool
+- name: Configure PHP 7.4 FPM's nextcloud pool
   copy: src=etc/php/fpm/pool.d/nextcloud.conf
-        dest=/etc/php/7.3/fpm/pool.d/nextcloud.conf
+        dest=/etc/php/7.4/fpm/pool.d/nextcloud.conf
         owner=root group=root
         mode=0644
   notify:
-    - Restart php7.3-fpm
+    - Restart php7.4-fpm
 
-- name: Start php7.3-fpm
-  service: name=php7.3-fpm state=started
+- name: Start php7.4-fpm
+  service: name=php7.4-fpm state=started
 
 - name: Copy /etc/cron.d/nextcloud
   copy: src=etc/cron.d/nextcloud
         dest=/etc/cron.d/nextcloud
         owner=root group=root
         mode=0644
 
 - name: Copy /etc/nginx/sites-available/nextcloud
   copy: src=etc/nginx/sites-available/nextcloud
         dest=/etc/nginx/sites-available/nextcloud
         owner=root group=root
         mode=0644
   register: r1
   notify:
     - Restart Nginx
 
 - name: Create /etc/nginx/sites-enabled/nextcloud
   file: src=../sites-available/nextcloud
         dest=/etc/nginx/sites-enabled/nextcloud
         owner=root group=root
@@ -164,27 +164,27 @@
 
 - name: Configure Redis
   lineinfile: dest=/etc/redis/redis.conf
               regexp='^#?\\s*{{ item.var }}\\s+'
               line="{{ item.var }} {{ item.value }}"
               owner=redis group=redis
               mode=0640
   with_items:
     - { var: port,           value: 0 }
     - { var: unixsocket,     value: /run/redis/redis-server.sock }
     - { var: unixsocketperm, value: 660 }
   notify:
     - Restart Redis
 
 - name: Start redis-server
   service: name=redis-server state=started
 
 - name: Add '_nextcloud' user to 'redis' group
   user: name=_nextcloud groups=redis append=yes
   notify:
-    - Restart php7.3-fpm
+    - Restart php7.4-fpm
 
 - name: Install other Nextcloud dependencies
   apt: pkg={{ packages }}
   vars:
     packages:
     - libmagickcore-6.q16-6-extra