From 03ed0a2cf79d3a8e5e718e165862525b1c8d64bb Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 22 Aug 2023 16:59:09 +0200 Subject: [PATCH] Added additional nextcloud configuration and redis cache --- roles/nextcloud/README.org | 7 +- roles/nextcloud/defaults/main.yml | 1 + roles/nextcloud/tasks/cache.yml | 43 +++++++ roles/nextcloud/tasks/caddy.yml | 26 ++++ roles/nextcloud/tasks/config.yml | 10 ++ roles/nextcloud/tasks/main.yml | 6 + roles/nextcloud/tasks/setup.yml | 9 ++ roles/nextcloud/templates/nextcloud | 8 ++ roles/nextcloud/templates/nginx.conf | 173 --------------------------- 9 files changed, 108 insertions(+), 175 deletions(-) create mode 100644 roles/nextcloud/tasks/cache.yml create mode 100644 roles/nextcloud/tasks/caddy.yml create mode 100644 roles/nextcloud/tasks/config.yml create mode 100644 roles/nextcloud/templates/nextcloud delete mode 100644 roles/nextcloud/templates/nginx.conf diff --git a/roles/nextcloud/README.org b/roles/nextcloud/README.org index 175746b..9b77bf0 100644 --- a/roles/nextcloud/README.org +++ b/roles/nextcloud/README.org @@ -1,2 +1,5 @@ -* roles/nextcloud -Ansible playbook role to setup a nextcloud docker container +* Nextcloud + +anaNAS uses [[https://nextcloud.com/][Nextcloud]] as the cloud backend. + +Nextcloud also provides a lovely web interface. diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 468033c..b7e7ce4 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -5,3 +5,4 @@ nextcloud_db: "nextcloud" nextcloud_db_user: "nextcloud" nextcloud_timezone: "Europe/Berlin" nextcloud_upload_size: "4G" +nextcloud_phone_region: "DE" diff --git a/roles/nextcloud/tasks/cache.yml b/roles/nextcloud/tasks/cache.yml new file mode 100644 index 0000000..e4e7dae --- /dev/null +++ b/roles/nextcloud/tasks/cache.yml @@ -0,0 +1,43 @@ +--- +- name: Use APCu as local cache + become: true + ansible.builtin.lineinfile: + insertbefore: "[)];" + path: "{{ container_dir }}\ + /{{ nextcloud_project_dir }}\ + /data/config/config.php" + search_string: "'memcache.local'" + line: "'memcache.local' => '\\OC\\Memcache\\APCu'," + +- name: Use Redis as distributed cache + become: true + ansible.builtin.lineinfile: + insertbefore: "[)];" + path: "{{ container_dir }}\ + /{{ nextcloud_project_dir }}\ + /data/config/config.php" + search_string: "'memcache.distributed'" + line: "'memcache.distributed' => '\\OC\\Memcache\\Redis'," + +- name: Use Redis for file locking + become: true + ansible.builtin.lineinfile: + insertbefore: "[)];" + path: "{{ container_dir }}\ + /{{ nextcloud_project_dir }}\ + /data/config/config.php" + search_string: "'memcache.locking'" + line: "'memcache.locking' => '\\OC\\Memcache\\Redis'," + +- name: Make sure redis is configured correctly + become: true + ansible.builtin.blockinfile: + insertbefore: "[)];" + path: "{{ container_dir }}\ + /{{ nextcloud_project_dir }}\ + /data/config/config.php" + block: | + 'redis' => array( + 'host' => 'nextcloud_redis', + 'port' => 6379 + ), diff --git a/roles/nextcloud/tasks/caddy.yml b/roles/nextcloud/tasks/caddy.yml new file mode 100644 index 0000000..82946a2 --- /dev/null +++ b/roles/nextcloud/tasks/caddy.yml @@ -0,0 +1,26 @@ +--- +- name: Make sure nextcloud-caddy reverse proxy config exists + become: true + ansible.builtin.template: + src: nextcloud + mode: "0644" + dest: /etc/caddy/nextcloud + validate: caddy validate --adapter caddyfile --config %s + register: projectconf + +- name: Make sure caddy links to the calckey config + become: true + ansible.builtin.lineinfile: + path: /etc/caddy/Caddyfile + search_string: ^import /etc/caddy/nextcloud + mode: "0644" + line: import /etc/caddy/nextcloud + validate: caddy validate --adapter caddyfile --config %s + register: globalconf + +- name: Restart caddy + become: true + ansible.builtin.service: + name: caddy + state: restarted + when: globalconf.changed or projectconf.changed diff --git a/roles/nextcloud/tasks/config.yml b/roles/nextcloud/tasks/config.yml new file mode 100644 index 0000000..a6dd212 --- /dev/null +++ b/roles/nextcloud/tasks/config.yml @@ -0,0 +1,10 @@ +--- +- name: Ensure the default_phone_region is set + become: true + ansible.builtin.lineinfile: + insertbefore: "[)];" + path: "{{ container_dir }}\ + /{{ nextcloud_project_dir }}\ + /data/config/config.php" + search_string: "'default_phone_region'" + line: "'default_phone_region' => '{{ nextcloud_phone_region }}'," diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 177968d..9664376 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -1,3 +1,9 @@ --- - name: Setup nextcloud docker images ansible.builtin.include_tasks: setup.yml +- name: Configure caching using redis + ansible.builtin.include_tasks: cache.yml +- name: Configure nextcloud + ansible.builtin.include_tasks: config.yml +- name: Configure Caddy nextcloud rules + ansible.builtin.include_tasks: caddy.yml diff --git a/roles/nextcloud/tasks/setup.yml b/roles/nextcloud/tasks/setup.yml index 06cd321..f73ef42 100644 --- a/roles/nextcloud/tasks/setup.yml +++ b/roles/nextcloud/tasks/setup.yml @@ -21,6 +21,14 @@ MYSQL_DATABASE: "{{ nextcloud_db }}" MYSQL_USER: "{{ nextcloud_db_user }}" +- name: Setup Redis for nextcloud + community.docker.docker_container: + name: nextcloud_redis + image: redis:6-alpine + restart_policy: unless-stopped + env: + TZ: "{{ nextcloud_timezone }}" + - name: Setup Nextcloud community.docker.docker_container: name: nextcloud @@ -44,6 +52,7 @@ - "8080:8000" links: - nextcloud_db + - nextcloud_redis - name: Setup Nextcloud Cron Sidecar community.docker.docker_container: diff --git a/roles/nextcloud/templates/nextcloud b/roles/nextcloud/templates/nextcloud new file mode 100644 index 0000000..f7499b9 --- /dev/null +++ b/roles/nextcloud/templates/nextcloud @@ -0,0 +1,8 @@ +http://localhost, http://127.0.0.1, http://{{ local_ip }}, http://{{ public_domain }} { + redir /.well-known/carddav /remote.php/dav 301 + redir /.well-known/caldav /remote.php/dav 301 + redir /.well-known/nodeinfo /index.php/.well-known/nodeinfo + redir /.well-known/webfinger /index.php/.well-known/webfinger + + reverse_proxy 127.0.0.1:8080 +} diff --git a/roles/nextcloud/templates/nginx.conf b/roles/nextcloud/templates/nginx.conf deleted file mode 100644 index 5dc9c00..0000000 --- a/roles/nextcloud/templates/nginx.conf +++ /dev/null @@ -1,173 +0,0 @@ -worker_processes auto; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - # Prevent nginx HTTP Server Detection - server_tokens off; - - keepalive_timeout 65; - - #gzip on; - - upstream php-handler { - server {{ nextcloud_host }}:9000; - } - - server { - listen 80; - - # HSTS settings - # 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 Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always; - - # 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; - - # Pagespeed is not supported by Nextcloud, so if your server is built - # with the `ngx_pagespeed` module, uncomment this line to disable it. - #pagespeed off; - - # HTTP response headers borrowed from Nextcloud `.htaccess` - add_header Referrer-Policy "no-referrer" always; - add_header X-Content-Type-Options "nosniff" always; - add_header X-Download-Options "noopen" always; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-Permitted-Cross-Domain-Policies "none" always; - add_header X-Robots-Tag "noindex, nofollow" always; - add_header X-XSS-Protection "1; mode=block" always; - - # 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/html; - - # Specify how to handle directories -- specifying `/index.php$request_uri` - # here as the fallback means that Nginx always exhibits the desired behaviour - # when a client requests a path that corresponds to a directory that exists - # on the server. In particular, if that directory contains an index.php file, - # that file is correctly served; if it doesn't, then the request is passed to - # the front-end controller. This consistent behaviour means that we don't need - # to specify custom rules for certain paths (e.g. images and other assets, - # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus - # `try_files $uri $uri/ /index.php$request_uri` - # always provides the desired behaviour. - index index.php index.html /index.php$request_uri; - - # Rule borrowed from `.htaccess` to handle Microsoft DAV clients - location = / { - if ( $http_user_agent ~ ^DavClnt ) { - return 302 /remote.php/webdav/$is_args$args; - } - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Make a regex exception for `/.well-known` so that clients can still - # access it despite the existence of the regex rule - # `location ~ /(\.|autotest|...)` which would otherwise handle requests - # for `/.well-known`. - location ^~ /.well-known { - # The rules in this block are an adaptation of the rules - # in `.htaccess` that concern `/.well-known`. - - location = /.well-known/carddav { return 301 /remote.php/dav/; } - location = /.well-known/caldav { return 301 /remote.php/dav/; } - - location /.well-known/acme-challenge { try_files $uri $uri/ =404; } - location /.well-known/pki-validation { try_files $uri $uri/ =404; } - - # Let Nextcloud's API for `/.well-known` URIs handle all other - # requests by passing them to the front-end controller. - return 301 /index.php$request_uri; - } - - # Rules borrowed from `.htaccess` to hide certain paths from clients - location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; } - location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; } - - # Ensure this block, which passes PHP files to the PHP process, is above the blocks - # which handle static assets (as seen below). If this block is not declared first, - # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php` - # to the URI, resulting in a HTTP 500 error response. - location ~ \.php(?:$|/) { - # Required for legacy support - rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri; - - 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; - - fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice - fastcgi_param front_controller_active true; # Enable pretty urls - fastcgi_pass php-handler; - - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - } - - location ~ \.(?:css|js|svg|gif)$ { - try_files $uri /index.php$request_uri; - expires 6M; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - location ~ \.woff2?$ { - try_files $uri /index.php$request_uri; - expires 7d; # Cache-Control policy borrowed from `.htaccess` - access_log off; # Optional: Don't log access to assets - } - - # Rule borrowed from `.htaccess` - location /remote { - return 301 /remote.php$request_uri; - } - - location / { - try_files $uri $uri/ /index.php$request_uri; - } - } -} -- 2.38.5