diff options
| -rw-r--r-- | roles/nextcloud/files/etc/nginx/sites-available/nextcloud | 37 | ||||
| -rw-r--r-- | roles/nextcloud/files/etc/php/fpm/pool.d/nextcloud.conf | 2 | ||||
| -rw-r--r-- | roles/nextcloud/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/nextcloud/tasks/main.yml | 28 |
4 files changed, 43 insertions, 28 deletions
diff --git a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud index 2abce2d..f1f4dcc 100644 --- a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud +++ b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud @@ -15,95 +15,110 @@ server { } server { listen 443 ssl http2; listen [::]:443 ssl http2; server_name cloud.fripost.org; root /usr/local/share/nextcloud; include snippets/headers.conf; add_header X-Robots-Tag "noindex, nofollow"; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; include snippets/ssl.conf; ssl_certificate ssl/cloud.fripost.org.pem; ssl_certificate_key ssl/cloud.fripost.org.key; include snippets/cloud.fripost.org.hpkp-hdr; + include mime.types; + types { + text/javascript js mjs; + application/wasm wasm; + } + location = /robots.txt { allow all; log_not_found off; access_log off; } access_log /var/log/nginx/cloud.access.log; error_log /var/log/nginx/cloud.error.log info; + index index.php index.html /index.php$request_uri; + location = /.well-known/carddav { return 301 /remote.php/dav; } location = /.well-known/caldav { return 301 /remote.php/dav; } location ^~ /.well-known/ { return 301 /index.php$request_uri; } # set max upload size client_max_body_size 512M; fastcgi_buffers 64 4K; fastcgi_buffer_size 32k; # 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(?:$|/) { + location ~ \.php(?:$|/) { + # Required for legacy support + rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri; + 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.4-fpm@nextcloud.sock; + fastcgi_pass unix:/run/php/php8.2-fpm@nextcloud.sock; } - location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) { - try_files $uri/ =404; - index index.php; - } - - location ~ \.(?:css|js|woff2?|svg|gif|map)$ { - expires 30d; + location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$uri$is_args$args; } - + location ~ \.woff2?$ { + try_files $uri /index.php$request_uri; + expires 7d; + } location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { try_files $uri /index.php$uri$is_args$args; } + location /remote { + return 301 /remote.php$request_uri; + } + + location / { + try_files $uri $uri/ /index.php$request_uri; + } + location = /core/img/favicon.ico { alias /var/www/nextcloud/fripost.ico; } } server { listen 80; listen [::]:80; listen 443 ssl http2; listen [::]:443 ssl http2; server_name www.cloud.fripost.org; include /etc/lacme/nginx.conf; access_log /var/log/nginx/cloud.access.log; error_log /var/log/nginx/cloud.error.log info; location / { return 301 https://cloud.fripost.org$request_uri; 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 001ebf8..898ce60 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.4-fpm@nextcloud.sock +listen = /run/php/php8.2-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 2fdd8b7..a14d6e1 100644 --- a/roles/nextcloud/handlers/main.yml +++ b/roles/nextcloud/handlers/main.yml @@ -1,9 +1,9 @@ --- -- name: Restart php7.4-fpm - service: name=php7.4-fpm state=restarted +- name: Restart php8.2-fpm + service: name=php8.2-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 69a662d..14bc02c 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -2,86 +2,86 @@ 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.4 Zend opcache - lineinfile: dest=/etc/php/7.4/fpm/php.ini +- name: Configure PHP 8.2 Zend opcache + lineinfile: dest=/etc/php/8.2/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 } - { var: opcache.interned_strings_buffer, value: 12 } notify: - - Restart php7.4-fpm + - Restart php8.2-fpm -- name: Configure PHP 7.4 CLI - lineinfile: dest=/etc/php/7.4/cli/php.ini +- name: Configure PHP 8.2 CLI + lineinfile: dest=/etc/php/8.2/cli/php.ini regexp='^;?{{ item.var }}\\s*=' line="{{ item.var }} = {{ item.value }}" owner=root group=root mode=0644 with_items: - { var: apc.enable_cli, value: 1 } - 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.4 FPM's www pool - file: path=/etc/php/7.4/fpm/pool.d/www.conf state=absent +- name: Delete PHP 8.2 FPM's www pool + file: path=/etc/php/8.2/fpm/pool.d/www.conf state=absent notify: - - Restart php7.4-fpm + - Restart php8.2-fpm -- name: Configure PHP 7.4 FPM's nextcloud pool +- name: Configure PHP 8.2 FPM's nextcloud pool copy: src=etc/php/fpm/pool.d/nextcloud.conf - dest=/etc/php/7.4/fpm/pool.d/nextcloud.conf + dest=/etc/php/8.2/fpm/pool.d/nextcloud.conf owner=root group=root mode=0644 notify: - - Restart php7.4-fpm + - Restart php8.2-fpm -- name: Start php7.4-fpm - service: name=php7.4-fpm state=started +- name: Start php8.2-fpm + service: name=php8.2-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 @@ -174,27 +174,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.4-fpm + - Restart php8.2-fpm - name: Install other Nextcloud dependencies apt: pkg={{ packages }} vars: packages: - libmagickcore-6.q16-6-extra |