diff --git a/defaults/main.yml b/defaults/main.yml index fd8558b..edd3411 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,3 +35,5 @@ nextcloud_postgresql_lc: de_DE.UTF-8 nextcloud_php_version: 7.3 nextcloud_reset_lib_directory: true + +nextcloud_webserver: nginx diff --git a/handlers/main.yml b/handlers/main.yml index c3f4ec1..caffe31 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,4 +4,16 @@ service: name: apache2 state: restarted - listen: certificate changed + listen: + - certificate changed + - restart webserver + when: nextcloud_webserver == 'apache2' + +- name: restart nginx + service: + name: nginx + state: restarted + listen: + - certificate changed + - restart webserver + when: nextcloud_webserver == 'nginx' diff --git a/tasks/apache2.yml b/tasks/apache2.yml index 28d3a44..6c63317 100644 --- a/tasks/apache2.yml +++ b/tasks/apache2.yml @@ -1,5 +1,16 @@ --- +- name: ensure nginx is uninstalled + apt: + pkg: + - nginx + - nginx-common + - nginx-extras + state: absent + +- import_role: + name: apache + - name: apache2 modules apache2_module: name: "{{ item }}" diff --git a/tasks/main.yml b/tasks/main.yml index ce05b27..5fec7a4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,15 +45,18 @@ - import_tasks: configure.yml -- include_tasks: apps.yml +- import_tasks: apps.yml when: nextcloud_version is version('13.0.0','ge') #- import_tasks: check.yaml - import_tasks: certificate.yml -- import_tasks: php.yaml +- import_tasks: nginx.yml + when: nextcloud_webserver == 'nginx' - import_tasks: apache2.yml + when: nextcloud_webserver == 'apache2' +- import_tasks: php.yaml - import_tasks: cron.yml diff --git a/tasks/nginx.yml b/tasks/nginx.yml new file mode 100644 index 0000000..9ae06d9 --- /dev/null +++ b/tasks/nginx.yml @@ -0,0 +1,27 @@ +--- + +- name: ensure apache is uninstalled + apt: + pkg: apache2 + state: absent + +- import_role: + name: nginx + +- name: nginx nextcloud vhost + template: + src: nginx-vhost.conf.j2 + dest: /etc/nginx/sites-available/nextcloud + notify: restart nginx + +- name: nginx nextcloud vhost enabled + file: + src: ../sites-available/nextcloud + dest: /etc/nginx/sites-enabled/nextcloud + state: link + notify: restart nginx + +- name: start nginx + service: + name: nginx + state: started diff --git a/tasks/php.yaml b/tasks/php.yaml index 5e56911..a50027c 100644 --- a/tasks/php.yaml +++ b/tasks/php.yaml @@ -1,10 +1,18 @@ --- +- import_role: + name: php + vars: + php_version: "{{nextcloud_php_version}}" + php_configure_opcache: true + php_fpm_install: "{{ nextcloud_webserver == 'nginx' }}" + php_apache_module: "{{ nextcloud_webserver == 'apache2' }}" + - name: php memory limit ini_file: - path: /etc/php/7.3/apache2/php.ini + path: /etc/php/7.3/{{nextcloud_php_config}}/php.ini section: PHP option: memory_limit value: '512M' backup: yes - notify: restart apache2 + notify: restart webserver diff --git a/tasks/setup_Debian.yml b/tasks/setup_Debian.yml index 8298016..3e1452b 100644 --- a/tasks/setup_Debian.yml +++ b/tasks/setup_Debian.yml @@ -1,15 +1,5 @@ --- - -- import_role: - name: apache - -- import_role: - name: php - vars: - php_version: "{{nextcloud_php_version}}" - php_configure_opcache: true - - name: install apt packages apt: pkg: @@ -31,4 +21,4 @@ - libreoffice - mariadb-client - rsync - notify: restart apache2 + notify: restart webserver diff --git a/templates/nginx-vhost.conf.j2 b/templates/nginx-vhost.conf.j2 new file mode 100644 index 0000000..c9adc95 --- /dev/null +++ b/templates/nginx-vhost.conf.j2 @@ -0,0 +1,153 @@ +{{ ansible_managed | comment }} + +upstream php-handler { + server unix:/var/run/php/php{{nextcloud_php_version}}-fpm.sock; +} + +server { + listen 80; + listen [::]:80; + server_name {{nextcloud_server_names|join(' ')}}; + + # enforce https + return 301 https://$server_name:443$request_uri; +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name {{nextcloud_server_names|join(' ')}}; + + # Use Mozilla's guidelines for SSL/TLS settings + # https://mozilla.github.io/server-side-tls/ssl-config-generator/ + # NOTE: some settings below might be redundant + ssl_certificate /etc/ssl/certs/{{nextcloud_server_names|first}}.fullchain.pem; + ssl_certificate_key /etc/ssl/private/{{nextcloud_server_names|first}}.key.pem; + + # Add headers to serve security related headers + # Before enabling Strict-Transport-Security headers please read into this + # topic first. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;"; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Path to the root of your installation + root /var/www/nextcloud; + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # The following 2 rules are only needed for the user_webfinger app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + + # The following rule is only needed for the Social app. + # Uncomment it if you're planning to use this app. + #rewrite ^/.well-known/webfinger /public.php?service=webfinger last; + + location = /.well-known/carddav { + return 301 $scheme://$host:$server_port/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host:$server_port/remote.php/dav; + } + + # set max upload size + client_max_body_size 512M; + fastcgi_buffers 64 4K; + + # 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; + + # Uncomment if your server is build with the ngx_pagespeed module + # This module is currently not supported. + #pagespeed off; + + location / { + rewrite ^ /index.php; + } + + location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ { + deny all; + } + location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) { + deny all; + } + + location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { + fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; + set $path_info $fastcgi_path_info; + try_files $fastcgi_script_name =404; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $path_info; + fastcgi_param HTTPS on; + # Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; + # Enable pretty urls + fastcgi_param front_controller_active true; + fastcgi_pass php-handler; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + } + + location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) { + try_files $uri/ =404; + index index.php; + } + + # Adding the cache control header for js, css and map files + # Make sure it is BELOW the PHP block + location ~ \.(?:css|js|woff2?|svg|gif|map)$ { + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + # Add headers to serve security related headers (It is intended to + # have those duplicated to the ones above) + # Before enabling Strict-Transport-Security headers please read into + # this topic first. + #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;"; + # + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header Referrer-Policy no-referrer; + + # Optional: Don't log access to assets + access_log off; + } + + location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { + try_files $uri /index.php$request_uri; + # Optional: Don't log access to other assets + access_log off; + } +} diff --git a/vars/main.yml b/vars/main.yml index 468c145..dbf33bb 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -19,3 +19,8 @@ _nextcloud_database_type_cli: _nextcloud_database_localhost_cli: mysql: localhost postgresql: /var/run/postgresql + +nextcloud_php_config: "{{ nextcloud_php_config_map[nextcloud_webserver] }}" +nextcloud_php_config_map: + nginx: fpm + apache2: apache2