From 2cfac63f0c3d5d0b78b70683a6496f183cd4952b Mon Sep 17 00:00:00 2001 From: matthias Date: Fri, 9 Jun 2023 10:08:27 +0000 Subject: [PATCH] Removed old stuff --- compose/nextcloud/docker-compose.yml | 48 ----- compose/nextcloud_nonswarm/docker-compose.yml | 63 ------- compose/nextcloud_nonswarm/nginx.conf | 173 ------------------ compose/owncloud/docker-compose.yml | 72 -------- 4 files changed, 356 deletions(-) delete mode 100644 compose/nextcloud/docker-compose.yml delete mode 100644 compose/nextcloud_nonswarm/docker-compose.yml delete mode 100644 compose/nextcloud_nonswarm/nginx.conf delete mode 100644 compose/owncloud/docker-compose.yml diff --git a/compose/nextcloud/docker-compose.yml b/compose/nextcloud/docker-compose.yml deleted file mode 100644 index b1c624a..0000000 --- a/compose/nextcloud/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ -version: "3.8" - -volumes: - nchome: - driver_opts: - type: nfs - o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/nextcloud/nchome - ncdata: - driver_opts: - type: nfs - o: addr=nextcloudstorage,nfsvers=4 - device: :/nextcloud_storage - - ncredis: - driver_opts: - type: nfs - o: addr=dockerstorage,nfsvers=4 - device: :/dockerstorage/nextcloud/redis - -services: - nextcloud: - image: nextcloud - container_name: nextcloud - environment: - - PUID=1000 #change PUID if needed - - PGID=100 #change PGID if needed - - TZ=Europe/Berlin #change Time Zone if needed - - REDIS_HOST=redis - volumes: - - ncdata:/var/www/html/data #/srv/dev-disk-by-label-disk1 needs to be adjusted - - nchome:/var/www/html #/srv/dev-disk-by-label-disk1 needs to be adjusted - # NAS shares -# - pictures:/pictures - #- /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/video:/video - depends_on: - - mariadb - ports: # uncomment this and the next line if you want to bypass the proxy - - 5443:443 - - 5080:80 - restart: unless-stopped - - redis: - image: redis:latest - restart: always - volumes: - - ncredis:/var/lib/redis - diff --git a/compose/nextcloud_nonswarm/docker-compose.yml b/compose/nextcloud_nonswarm/docker-compose.yml deleted file mode 100644 index db4a9d9..0000000 --- a/compose/nextcloud_nonswarm/docker-compose.yml +++ /dev/null @@ -1,63 +0,0 @@ -version: '3.8' - -volumes: - nchome: - driver: local - driver_opts: - o: bind - type: none - device: /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/nextcloud/home - ncdata: - driver: local - driver_opts: - o: bind - type: none - device: /srv/dev-disk-by-uuid-5fd62ae6-1354-4719-a780-a2ae675af5cb/nextcloud_storage - ncdatabase: - driver: local - driver_opts: - o: bind - type: none - device: /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/nextcloud/database - -services: - db: - image: mariadb - restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed - volumes: - - ncdatabase:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=rootpassword - - MYSQL_PASSWORD=mypassword - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - app: - image: arm64v8/nextcloud - restart: always - links: - - db - ports: - - 9292:80 - volumes: - - nchome:/var/www/html - - ncdata:/var/www/html/data - environment: - - MYSQL_PASSWORD=mypassword - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_HOST=db - - PHP_MEMORY_LIMIT=512M - - REDIS_HOST=redis - deploy: - resources: - limits: - cpus: '5.0' - memory: 3G - - redis: - image: redis:latest - restart: always -# volumes: -# - ncredis:/data diff --git a/compose/nextcloud_nonswarm/nginx.conf b/compose/nextcloud_nonswarm/nginx.conf deleted file mode 100644 index 16348de..0000000 --- a/compose/nextcloud_nonswarm/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 app: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; - } - } -} diff --git a/compose/owncloud/docker-compose.yml b/compose/owncloud/docker-compose.yml deleted file mode 100644 index 559e51f..0000000 --- a/compose/owncloud/docker-compose.yml +++ /dev/null @@ -1,72 +0,0 @@ -version: "3.9" - -volumes: - files: - driver: local - mysql: - driver: local - redis: - driver: local - -services: - owncloud: - image: owncloud/server:latest - container_name: owncloud_server - restart: always - depends_on: - - mariadb - - redis - environment: - - OWNCLOUD_DOMAIN=oc.vbchaos.nl - - OWNCLOUD_DB_TYPE=mysql - - OWNCLOUD_DB_NAME=owncloud - - OWNCLOUD_DB_USERNAME=owncloud - - OWNCLOUD_DB_PASSWORD=owncloud - - OWNCLOUD_DB_HOST=mariadb - - OWNCLOUD_ADMIN_USERNAME=admin - - OWNCLOUD_ADMIN_PASSWORD=password - - OWNCLOUD_MYSQL_UTF8MB4=true - - OWNCLOUD_REDIS_ENABLED=true - - OWNCLOUD_REDIS_HOST=redis - - VIRTUAL_HOST=oc.vbchaos.nl - - VIRTUAL_PORT=9898 - healthcheck: - test: ["CMD", "/usr/bin/healthcheck"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - files:/mnt/data - ports: - - 9898:8080 - - mariadb: - image: mariadb:10.5 - container_name: owncloud_mariadb - restart: always - environment: - - MYSQL_ROOT_PASSWORD=owncloud - - MYSQL_USER=owncloud - - MYSQL_PASSWORD=owncloud - - MYSQL_DATABASE=owncloud - command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"] - healthcheck: - test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"] - interval: 10s - timeout: 5s - retries: 5 - volumes: - - mysql:/var/lib/mysql - - redis: - image: redis:6 - container_name: owncloud_redis - restart: always - command: ["--databases", "1"] - healthcheck: - test: ["CMD", "redis-cli", "ping"] - interval: 10s - timeout: 5s - retries: 5 - volumes: - - redis:/data