From 66397de2670cf1346b5334d5bc0068c572891108 Mon Sep 17 00:00:00 2001 From: gcch Date: Tue, 4 Nov 2025 13:21:41 +0100 Subject: [PATCH] 2025-11-04 --- .gitignore | 3 + bun.lock | 75 +- compose.yaml | 148 ++++ composer.lock | 12 +- containers/Dockerfile | 18 +- containers/conf/angie/angie.conf | 56 ++ containers/conf/angie/angie.conf-original | 117 +++ containers/conf/angie/angie.conf-packaged | 201 +++++ containers/conf/angie/compression.conf | 102 +++ containers/conf/angie/fastcgi.conf | 20 + containers/conf/angie/haikuatelier.conf | 52 ++ containers/conf/angie/mime.types | 99 +++ .../mod-http-access-plus.conf | 1 + .../modules-available/mod-http-auth-ldap.conf | 1 + .../modules-available/mod-http-auth-pam.conf | 1 + .../mod-http-auth-spnego.conf | 1 + .../modules-available/mod-http-brotli.conf | 2 + .../mod-http-cache-purge.conf | 1 + .../modules-available/mod-http-captcha.conf | 1 + .../modules-available/mod-http-concat.conf | 1 + .../modules-available/mod-http-dav-ext.conf | 1 + .../angie/modules-available/mod-http-doh.conf | 1 + .../mod-http-dynamic-etag.conf | 1 + .../mod-http-early-hints.conf | 1 + .../modules-available/mod-http-echo.conf | 1 + .../mod-http-encrypted-session.conf | 1 + .../modules-available/mod-http-eval.conf | 1 + .../mod-http-fancyindex.conf | 1 + .../modules-available/mod-http-flv-live.conf | 1 + .../modules-available/mod-http-geoip.conf | 1 + .../modules-available/mod-http-geoip2.conf | 1 + .../mod-http-headers-more-filter.conf | 1 + .../mod-http-image-filter.conf | 1 + .../modules-available/mod-http-immutable.conf | 1 + .../mod-http-js-challenge.conf | 1 + .../mod-http-length-hiding-filter.conf | 1 + .../angie/modules-available/mod-http-lua.conf | 1 + .../mod-http-modsecurity.conf | 1 + .../modules-available/mod-http-naxsi.conf | 1 + .../angie/modules-available/mod-http-ndk.conf | 1 + .../angie/modules-available/mod-http-njs.conf | 1 + .../modules-available/mod-http-perl.conf | 1 + .../modules-available/mod-http-redis2.conf | 1 + .../mod-http-security-headers.conf | 1 + .../modules-available/mod-http-set-misc.conf | 1 + .../mod-http-subs-filter.conf | 1 + .../modules-available/mod-http-sysguard.conf | 1 + .../mod-http-testcookie-access.conf | 1 + .../mod-http-trim-filter.conf | 1 + .../mod-http-uploadprogress.conf | 1 + .../mod-http-upstream-fair.conf | 1 + .../mod-http-vhost-traffic-status.conf | 1 + .../angie/modules-available/mod-http-waf.conf | 1 + .../mod-http-xslt-filter.conf | 1 + .../mod-http-xss-filter.conf | 1 + .../modules-available/mod-http-zstd.conf | 2 + .../angie/modules-available/mod-ipscrub.conf | 1 + .../angie/modules-available/mod-mail.conf | 1 + .../angie/modules-available/mod-nchan.conf | 1 + .../modules-available/mod-pagespeed.conf | 1 + .../modules-available/mod-stream-geoip.conf | 1 + .../modules-available/mod-stream-geoip2.conf | 1 + .../modules-available/mod-stream-lua.conf | 1 + .../angie/modules-available/mod-stream.conf | 1 + .../modules-enabled/50-mod-http-brotli.conf | 1 + .../50-mod-http-dynamic-etag.conf | 1 + .../50-mod-http-headers-more-filter.conf | 1 + .../modules-enabled/50-mod-http-zstd.conf | 1 + .../99-mod-http-security-headers.conf | 1 + containers/conf/angie/scripts/cloudflare.sh | 19 + .../conf/angie/scripts/reorder-modules.sh | 63 ++ .../conf/angie/snippets/bots-map.conf-example | 723 ++++++++++++++++++ .../conf/angie/snippets/bots.conf-example | 20 + .../conf/angie/snippets/cloudflare.conf | 26 + .../conf/angie/snippets/fastcgi-php.conf | 13 + containers/conf/angie/snippets/http3.txt | 14 + .../angie/snippets/letsencrypt-redirect.conf | 48 ++ .../libmodsecurity-global.conf.example | 91 +++ .../conf/angie/snippets/lua.conf-example | 10 + .../snippets/nginx_module_vts.conf-example | 3 + .../conf/angie/snippets/proxy.conf-example | 35 + .../conf/angie/snippets/security.conf-example | 129 ++++ containers/conf/angie/snippets/snakeoil.conf | 5 + .../angie/snippets/wordpress-example.conf | 124 +++ containers/conf/php.ini | 14 + containers/conf/traefik/dynamic/certs.yaml | 7 + containers/conf/traefik/dynamic/general.yaml | 59 ++ containers/conf/traefik/dynamic/routers.yaml | 48 ++ containers/conf/traefik/dynamic/services.yaml | 24 + containers/conf/traefik/traefik.yaml | 60 ++ containers/conf/valkey.conf | 3 + cspell.json | 28 +- justfile | 22 + package.json | 7 +- scripts/pull-container-images.ts | 42 + .../haiku-atelier-2024/views/a-propos.twig | 12 + .../haiku-atelier-2024/views/accueil.twig | 2 + .../views/parts/menu-categories-produits.twig | 4 + .../produit/grille-produits-similaires.twig | 2 +- .../parts/pages/produit/photos-produit.twig | 10 +- .../parts/pages/shop/grille-produits.twig | 2 +- 101 files changed, 2573 insertions(+), 58 deletions(-) create mode 100755 compose.yaml create mode 100755 containers/conf/angie/angie.conf create mode 100755 containers/conf/angie/angie.conf-original create mode 100755 containers/conf/angie/angie.conf-packaged create mode 100755 containers/conf/angie/compression.conf create mode 100755 containers/conf/angie/fastcgi.conf create mode 100755 containers/conf/angie/haikuatelier.conf create mode 100755 containers/conf/angie/mime.types create mode 100755 containers/conf/angie/modules-available/mod-http-access-plus.conf create mode 100755 containers/conf/angie/modules-available/mod-http-auth-ldap.conf create mode 100755 containers/conf/angie/modules-available/mod-http-auth-pam.conf create mode 100755 containers/conf/angie/modules-available/mod-http-auth-spnego.conf create mode 100755 containers/conf/angie/modules-available/mod-http-brotli.conf create mode 100755 containers/conf/angie/modules-available/mod-http-cache-purge.conf create mode 100755 containers/conf/angie/modules-available/mod-http-captcha.conf create mode 100755 containers/conf/angie/modules-available/mod-http-concat.conf create mode 100755 containers/conf/angie/modules-available/mod-http-dav-ext.conf create mode 100755 containers/conf/angie/modules-available/mod-http-doh.conf create mode 100755 containers/conf/angie/modules-available/mod-http-dynamic-etag.conf create mode 100755 containers/conf/angie/modules-available/mod-http-early-hints.conf create mode 100755 containers/conf/angie/modules-available/mod-http-echo.conf create mode 100755 containers/conf/angie/modules-available/mod-http-encrypted-session.conf create mode 100755 containers/conf/angie/modules-available/mod-http-eval.conf create mode 100755 containers/conf/angie/modules-available/mod-http-fancyindex.conf create mode 100755 containers/conf/angie/modules-available/mod-http-flv-live.conf create mode 100755 containers/conf/angie/modules-available/mod-http-geoip.conf create mode 100755 containers/conf/angie/modules-available/mod-http-geoip2.conf create mode 100755 containers/conf/angie/modules-available/mod-http-headers-more-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-image-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-immutable.conf create mode 100755 containers/conf/angie/modules-available/mod-http-js-challenge.conf create mode 100755 containers/conf/angie/modules-available/mod-http-length-hiding-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-lua.conf create mode 100755 containers/conf/angie/modules-available/mod-http-modsecurity.conf create mode 100755 containers/conf/angie/modules-available/mod-http-naxsi.conf create mode 100755 containers/conf/angie/modules-available/mod-http-ndk.conf create mode 100755 containers/conf/angie/modules-available/mod-http-njs.conf create mode 100755 containers/conf/angie/modules-available/mod-http-perl.conf create mode 100755 containers/conf/angie/modules-available/mod-http-redis2.conf create mode 100755 containers/conf/angie/modules-available/mod-http-security-headers.conf create mode 100755 containers/conf/angie/modules-available/mod-http-set-misc.conf create mode 100755 containers/conf/angie/modules-available/mod-http-subs-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-sysguard.conf create mode 100755 containers/conf/angie/modules-available/mod-http-testcookie-access.conf create mode 100755 containers/conf/angie/modules-available/mod-http-trim-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-uploadprogress.conf create mode 100755 containers/conf/angie/modules-available/mod-http-upstream-fair.conf create mode 100755 containers/conf/angie/modules-available/mod-http-vhost-traffic-status.conf create mode 100755 containers/conf/angie/modules-available/mod-http-waf.conf create mode 100755 containers/conf/angie/modules-available/mod-http-xslt-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-xss-filter.conf create mode 100755 containers/conf/angie/modules-available/mod-http-zstd.conf create mode 100755 containers/conf/angie/modules-available/mod-ipscrub.conf create mode 100755 containers/conf/angie/modules-available/mod-mail.conf create mode 100755 containers/conf/angie/modules-available/mod-nchan.conf create mode 100755 containers/conf/angie/modules-available/mod-pagespeed.conf create mode 100755 containers/conf/angie/modules-available/mod-stream-geoip.conf create mode 100755 containers/conf/angie/modules-available/mod-stream-geoip2.conf create mode 100755 containers/conf/angie/modules-available/mod-stream-lua.conf create mode 100755 containers/conf/angie/modules-available/mod-stream.conf create mode 120000 containers/conf/angie/modules-enabled/50-mod-http-brotli.conf create mode 120000 containers/conf/angie/modules-enabled/50-mod-http-dynamic-etag.conf create mode 120000 containers/conf/angie/modules-enabled/50-mod-http-headers-more-filter.conf create mode 120000 containers/conf/angie/modules-enabled/50-mod-http-zstd.conf create mode 120000 containers/conf/angie/modules-enabled/99-mod-http-security-headers.conf create mode 100755 containers/conf/angie/scripts/cloudflare.sh create mode 100755 containers/conf/angie/scripts/reorder-modules.sh create mode 100755 containers/conf/angie/snippets/bots-map.conf-example create mode 100755 containers/conf/angie/snippets/bots.conf-example create mode 100755 containers/conf/angie/snippets/cloudflare.conf create mode 100755 containers/conf/angie/snippets/fastcgi-php.conf create mode 100755 containers/conf/angie/snippets/http3.txt create mode 100755 containers/conf/angie/snippets/letsencrypt-redirect.conf create mode 100755 containers/conf/angie/snippets/libmodsecurity-global.conf.example create mode 100755 containers/conf/angie/snippets/lua.conf-example create mode 100755 containers/conf/angie/snippets/nginx_module_vts.conf-example create mode 100755 containers/conf/angie/snippets/proxy.conf-example create mode 100755 containers/conf/angie/snippets/security.conf-example create mode 100755 containers/conf/angie/snippets/snakeoil.conf create mode 100755 containers/conf/angie/snippets/wordpress-example.conf create mode 100755 containers/conf/php.ini create mode 100755 containers/conf/traefik/dynamic/certs.yaml create mode 100755 containers/conf/traefik/dynamic/general.yaml create mode 100755 containers/conf/traefik/dynamic/routers.yaml create mode 100755 containers/conf/traefik/dynamic/services.yaml create mode 100755 containers/conf/traefik/traefik.yaml create mode 100755 containers/conf/valkey.conf create mode 100644 scripts/pull-container-images.ts diff --git a/.gitignore b/.gitignore index 91d407e2..a7a72925 100755 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,6 @@ build/ /playwright-report/ /blob-report/ /playwright/.cache/ + +# Containers +containers/data/* diff --git a/bun.lock b/bun.lock index 2fd878c1..4a54cc7d 100644 --- a/bun.lock +++ b/bun.lock @@ -9,6 +9,7 @@ "@sentry/browser": "^10.22.0", "a11y-dialog": "^8.1.4", "chalk": "^5.6.2", + "effect": "^3.19.0", "lit-html": "^3.3.1", "loglevel": "^1.9.2", "loglevel-plugin-prefix": "^0.8.4", @@ -20,7 +21,7 @@ "devDependencies": { "@biomejs/biome": "^2.3.3", "@cspell/dict-fr-fr": "^2.3.2", - "@eslint/js": "^9.39.0", + "@eslint/js": "^9.39.1", "@playwright/test": "^1.56.1", "@prettier/plugin-php": "^0.24.0", "@prettier/plugin-xml": "^3.4.2", @@ -32,7 +33,7 @@ "better-typescript-lib": "^2.12.0", "browserslist": "^4.27.0", "caniuse-lite": "^1.0.30001753", - "eslint": "^9.39.0", + "eslint": "^9.39.1", "eslint-plugin-oxlint": "^1.25.0", "eslint-plugin-perfectionist": "^4.15.1", "fdir": "^6.5.0", @@ -53,7 +54,7 @@ "stylelint-declaration-block-no-ignored-properties": "^2.8.0", "stylelint-plugin-logical-css": "^1.2.3", "typescript": "5.9.3", - "typescript-eslint": "^8.46.2", + "typescript-eslint": "^8.46.3", "vite": "^7.1.12", "vite-plugin-compression2": "^2.3.1", "vite-plugin-manifest-sri": "^0.2.0", @@ -359,7 +360,7 @@ "@eslint/eslintrc": ["@eslint/eslintrc@3.3.1", "", { "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ=="], - "@eslint/js": ["@eslint/js@9.39.0", "", {}, "sha512-BIhe0sW91JGPiaF1mOuPy5v8NflqfjIcDNpC+LbW9f609WVRX1rArrhi6Z2ymvrAry9jw+5POTj4t2t62o8Bmw=="], + "@eslint/js": ["@eslint/js@9.39.1", "http://localhost:4873/@eslint/js/-/js-9.39.1.tgz", {}, "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw=="], "@eslint/object-schema": ["@eslint/object-schema@2.1.7", "", {}, "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA=="], @@ -587,6 +588,8 @@ "@sindresorhus/is": ["@sindresorhus/is@5.6.0", "", {}, "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g=="], + "@standard-schema/spec": ["@standard-schema/spec@1.0.0", "http://localhost:4873/@standard-schema/spec/-/spec-1.0.0.tgz", {}, "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="], + "@stylistic/stylelint-plugin": ["@stylistic/stylelint-plugin@3.1.2", "", { "dependencies": { "@csstools/css-parser-algorithms": "^3.0.1", "@csstools/css-tokenizer": "^3.0.1", "@csstools/media-query-list-parser": "^3.0.1", "is-plain-object": "^5.0.0", "postcss-selector-parser": "^6.1.2", "postcss-value-parser": "^4.2.0", "style-search": "^0.1.0", "stylelint": "^16.8.2" } }, "sha512-tylFJGMQo62alGazK74MNxFjMagYOHmBZiePZFOJK2n13JZta0uVkB3Bh5qodUmOLtRH+uxH297EibK14UKm8g=="], "@swc/cli": ["@swc/cli@0.7.8", "", { "dependencies": { "@swc/counter": "^0.1.3", "@xhmikosr/bin-wrapper": "^13.0.5", "commander": "^8.3.0", "minimatch": "^9.0.3", "piscina": "^4.3.1", "semver": "^7.3.8", "slash": "3.0.0", "source-map": "^0.7.3", "tinyglobby": "^0.2.13" }, "peerDependencies": { "@swc/core": "^1.2.66", "chokidar": "^4.0.1" }, "optionalPeers": ["chokidar"], "bin": { "swc": "bin/swc.js", "swcx": "bin/swcx.js", "spack": "bin/spack.js" } }, "sha512-27Ov4rm0s2C6LLX+NDXfDVB69LGs8K94sXtFhgeUyQ4DBywZuCgTBu2loCNHRr8JhT9DeQvJM5j9FAu/THbo4w=="], @@ -635,25 +638,25 @@ "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="], - "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.46.2", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.46.2", "@typescript-eslint/type-utils": "8.46.2", "@typescript-eslint/utils": "8.46.2", "@typescript-eslint/visitor-keys": "8.46.2", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.46.2", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w=="], + "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.46.3", "http://localhost:4873/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.3.tgz", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/type-utils": "8.46.3", "@typescript-eslint/utils": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.46.3", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-sbaQ27XBUopBkRiuY/P9sWGOWUW4rl8fDoHIUmLpZd8uldsTyB4/Zg6bWTegPoTLnKj9Hqgn3QD6cjPNB32Odw=="], - "@typescript-eslint/parser": ["@typescript-eslint/parser@8.46.2", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.46.2", "@typescript-eslint/types": "8.46.2", "@typescript-eslint/typescript-estree": "8.46.2", "@typescript-eslint/visitor-keys": "8.46.2", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g=="], + "@typescript-eslint/parser": ["@typescript-eslint/parser@8.46.3", "http://localhost:4873/@typescript-eslint/parser/-/parser-8.46.3.tgz", { "dependencies": { "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg=="], - "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.46.2", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.46.2", "@typescript-eslint/types": "^8.46.2", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg=="], + "@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.46.3", "http://localhost:4873/@typescript-eslint/project-service/-/project-service-8.46.3.tgz", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.46.3", "@typescript-eslint/types": "^8.46.3", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-Fz8yFXsp2wDFeUElO88S9n4w1I4CWDTXDqDr9gYvZgUpwXQqmZBr9+NTTql5R3J7+hrJZPdpiWaB9VNhAKYLuQ=="], "@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.46.2", "", { "dependencies": { "@typescript-eslint/types": "8.46.2", "@typescript-eslint/visitor-keys": "8.46.2" } }, "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA=="], - "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.46.2", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag=="], + "@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.46.3", "http://localhost:4873/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.3.tgz", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-GLupljMniHNIROP0zE7nCcybptolcH8QZfXOpCfhQDAdwJ/ZTlcaBOYebSOZotpti/3HrHSw7D3PZm75gYFsOA=="], - "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.46.2", "", { "dependencies": { "@typescript-eslint/types": "8.46.2", "@typescript-eslint/typescript-estree": "8.46.2", "@typescript-eslint/utils": "8.46.2", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA=="], + "@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.46.3", "http://localhost:4873/@typescript-eslint/type-utils/-/type-utils-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3", "@typescript-eslint/utils": "8.46.3", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-ZPCADbr+qfz3aiTTYNNkCbUt+cjNwI/5McyANNrFBpVxPt7GqpEYz5ZfdwuFyGUnJ9FdDXbGODUu6iRCI6XRXw=="], "@typescript-eslint/types": ["@typescript-eslint/types@8.46.2", "", {}, "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ=="], - "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.46.2", "", { "dependencies": { "@typescript-eslint/project-service": "8.46.2", "@typescript-eslint/tsconfig-utils": "8.46.2", "@typescript-eslint/types": "8.46.2", "@typescript-eslint/visitor-keys": "8.46.2", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ=="], + "@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.46.3", "http://localhost:4873/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.3.tgz", { "dependencies": { "@typescript-eslint/project-service": "8.46.3", "@typescript-eslint/tsconfig-utils": "8.46.3", "@typescript-eslint/types": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-f/NvtRjOm80BtNM5OQtlaBdM5BRFUv7gf381j9wygDNL+qOYSNOgtQ/DCndiYi80iIOv76QqaTmp4fa9hwI0OA=="], "@typescript-eslint/utils": ["@typescript-eslint/utils@8.46.2", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.46.2", "@typescript-eslint/types": "8.46.2", "@typescript-eslint/typescript-estree": "8.46.2" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg=="], - "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.46.2", "", { "dependencies": { "@typescript-eslint/types": "8.46.2", "eslint-visitor-keys": "^4.2.1" } }, "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w=="], + "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.46.3", "http://localhost:4873/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "eslint-visitor-keys": "^4.2.1" } }, "sha512-uk574k8IU0rOF/AjniX8qbLSGURJVUCeM5e4MIMKBFFi8weeiLrG1fyQejyLXQpRZbU/1BuQasleV/RfHC3hHg=="], "@typescript/lib-decorators": ["@better-typescript-lib/decorators@2.12.0", "", { "peerDependencies": { "typescript": ">=4.5.2" } }, "sha512-/m9Q5Xk66ThUJidTsxmXJH0+49iCLl5PFmue0HkNSGrcPU96oaoKNY5sH1AslwA/OWVvBg3hE58ZwSGm6TQFuQ=="], @@ -895,6 +898,8 @@ "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="], + "effect": ["effect@3.19.0", "http://localhost:4873/effect/-/effect-3.19.0.tgz", { "dependencies": { "@standard-schema/spec": "^1.0.0", "fast-check": "^3.23.1" } }, "sha512-eFvvryWkbXvQ4Gak1Nadv9CW6U35+UUS/fIkF4c/Th8rs2u47g+tNkViYeVGliglNnR6Ai5Otl9tLbav3yZjXg=="], + "electron-to-chromium": ["electron-to-chromium@1.5.244", "", {}, "sha512-OszpBN7xZX4vWMPJwB9illkN/znA8M36GQqQxi6MNy9axWxhOfJyZZJtSLQCpEFLHP2xK33BiWx9aIuIEXVCcw=="], "elliptic": ["elliptic@6.6.1", "", { "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", "hash.js": "^1.0.0", "hmac-drbg": "^1.0.1", "inherits": "^2.0.4", "minimalistic-assert": "^1.0.1", "minimalistic-crypto-utils": "^1.0.1" } }, "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g=="], @@ -917,7 +922,7 @@ "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], - "eslint": ["eslint@9.39.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.1", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.39.0", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-iy2GE3MHrYTL5lrCtMZ0X1KLEKKUjmK0kzwcnefhR66txcEmXZD2YWgR5GNdcEwkNx3a0siYkSvl0vIC+Svjmg=="], + "eslint": ["eslint@9.39.1", "http://localhost:4873/eslint/-/eslint-9.39.1.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.1", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.39.1", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g=="], "eslint-plugin-oxlint": ["eslint-plugin-oxlint@1.25.0", "", { "dependencies": { "jsonc-parser": "^3.3.1" } }, "sha512-grS4KdR9FAxoQC+wMkepeQHL4osMhoYfUI11Pot6Gitqr4wWi+JZrX0Shr8Bs9fjdWhEjtaZIV6cr4mbfytmyw=="], @@ -949,6 +954,8 @@ "ext-name": ["ext-name@5.0.0", "", { "dependencies": { "ext-list": "^2.0.0", "sort-keys-length": "^1.0.0" } }, "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="], + "fast-check": ["fast-check@3.23.2", "http://localhost:4873/fast-check/-/fast-check-3.23.2.tgz", { "dependencies": { "pure-rand": "^6.1.0" } }, "sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A=="], + "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], "fast-fifo": ["fast-fifo@1.3.2", "", {}, "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="], @@ -1341,6 +1348,8 @@ "punycode": ["punycode@1.4.1", "", {}, "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="], + "pure-rand": ["pure-rand@6.1.0", "http://localhost:4873/pure-rand/-/pure-rand-6.1.0.tgz", {}, "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA=="], + "purify-ts": ["purify-ts@2.1.2", "", { "dependencies": { "@types/json-schema": "7.0.15" } }, "sha512-v9RnHfoxZJZt5PeZork6zErRwYnGKxUiO7wk+NqPnJcG7AKjt97ut41WbGRMSUuMBexrXZsVNePSMcO9qPHODQ=="], "qified": ["qified@0.5.1", "", { "dependencies": { "hookified": "^1.12.2" } }, "sha512-+BtFN3dCP+IaFA6IYNOu/f/uK1B8xD2QWyOeCse0rjtAebBmkzgd2d1OAXi3ikAzJMIBSdzZDNZ3wZKEUDQs5w=="], @@ -1581,7 +1590,7 @@ "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], - "typescript-eslint": ["typescript-eslint@8.46.2", "", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.46.2", "@typescript-eslint/parser": "8.46.2", "@typescript-eslint/typescript-estree": "8.46.2", "@typescript-eslint/utils": "8.46.2" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-vbw8bOmiuYNdzzV3lsiWv6sRwjyuKJMQqWulBOU7M0RrxedXledX8G8kBbQeiOYDnTfiXz0Y4081E1QMNB6iQg=="], + "typescript-eslint": ["typescript-eslint@8.46.3", "http://localhost:4873/typescript-eslint/-/typescript-eslint-8.46.3.tgz", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.46.3", "@typescript-eslint/parser": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3", "@typescript-eslint/utils": "8.46.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-bAfgMavTuGo+8n6/QQDVQz4tZ4f7Soqg53RbrlZQEoAltYop/XR4RAts/I0BrO3TTClTSTFJ0wYbla+P8cEWJA=="], "uint8array-extras": ["uint8array-extras@1.4.0", "", {}, "sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ=="], @@ -1751,8 +1760,30 @@ "@types/eslint__js/@eslint/js": ["@eslint/js@9.29.0", "", {}, "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ=="], + "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.46.3", "http://localhost:4873/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3" } }, "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg=="], + + "@typescript-eslint/eslint-plugin/@typescript-eslint/utils": ["@typescript-eslint/utils@8.46.3", "http://localhost:4873/@typescript-eslint/utils/-/utils-8.46.3.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g=="], + "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="], + "@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.46.3", "http://localhost:4873/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3" } }, "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg=="], + + "@typescript-eslint/parser/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/project-service/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/scope-manager/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.46.2", "", { "dependencies": { "@typescript-eslint/types": "8.46.2", "eslint-visitor-keys": "^4.2.1" } }, "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w=="], + + "@typescript-eslint/type-utils/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/type-utils/@typescript-eslint/utils": ["@typescript-eslint/utils@8.46.3", "http://localhost:4873/@typescript-eslint/utils/-/utils-8.46.3.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g=="], + + "@typescript-eslint/typescript-estree/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/utils/@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.46.2", "", { "dependencies": { "@typescript-eslint/project-service": "8.46.2", "@typescript-eslint/tsconfig-utils": "8.46.2", "@typescript-eslint/types": "8.46.2", "@typescript-eslint/visitor-keys": "8.46.2", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ=="], + + "@typescript-eslint/visitor-keys/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + "asn1.js/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="], "babel-plugin-polyfill-corejs2/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="], @@ -1821,6 +1852,8 @@ "to-buffer/isarray": ["isarray@2.0.5", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="], + "typescript-eslint/@typescript-eslint/utils": ["@typescript-eslint/utils@8.46.3", "http://localhost:4873/@typescript-eslint/utils/-/utils-8.46.3.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.46.3", "@typescript-eslint/types": "8.46.3", "@typescript-eslint/typescript-estree": "8.46.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } }, "sha512-VXw7qmdkucEx9WkmR3ld/u6VhRyKeiF1uxWwCy/iuNfokjJ7VhsgLSOTjsol8BunSw190zABzpwdNsze2Kpo4g=="], + "uri-js/punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="], "vite/fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], @@ -1947,6 +1980,18 @@ "@stylistic/stylelint-plugin/stylelint/postcss-selector-parser": ["postcss-selector-parser@7.1.0", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA=="], + "@typescript-eslint/eslint-plugin/@typescript-eslint/scope-manager/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/eslint-plugin/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + + "@typescript-eslint/type-utils/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.46.3", "http://localhost:4873/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3" } }, "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg=="], + + "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.46.2", "", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.46.2", "@typescript-eslint/types": "^8.46.2", "debug": "^4.3.4" }, "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg=="], + + "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.46.2", "", { "peerDependencies": { "typescript": ">=4.8.4 <6.0.0" } }, "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag=="], + + "@typescript-eslint/utils/@typescript-eslint/typescript-estree/@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.46.2", "", { "dependencies": { "@typescript-eslint/types": "8.46.2", "eslint-visitor-keys": "^4.2.1" } }, "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w=="], + "browserify-sign/readable-stream/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="], "browserify-sign/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="], @@ -1973,6 +2018,10 @@ "table/ajv/json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], + "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.46.3", "http://localhost:4873/@typescript-eslint/scope-manager/-/scope-manager-8.46.3.tgz", { "dependencies": { "@typescript-eslint/types": "8.46.3", "@typescript-eslint/visitor-keys": "8.46.3" } }, "sha512-FCi7Y1zgrmxp3DfWfr+3m9ansUUFoy8dkEdeQSgA9gbm8DaHYvZCdkFRQrtKiedFf3Ha6VmoqoAaP68+i+22kg=="], + + "typescript-eslint/@typescript-eslint/utils/@typescript-eslint/types": ["@typescript-eslint/types@8.46.3", "http://localhost:4873/@typescript-eslint/types/-/types-8.46.3.tgz", {}, "sha512-G7Ok9WN/ggW7e/tOf8TQYMaxgID3Iujn231hfi0Pc7ZheztIJVpO44ekY00b7akqc6nZcvregk0Jpah3kep6hA=="], + "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/generator/@jridgewell/gen-mapping": ["@jridgewell/gen-mapping@0.3.8", "", { "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA=="], "@babel/helper-create-class-features-plugin/@babel/traverse/@babel/generator/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="], diff --git a/compose.yaml b/compose.yaml new file mode 100755 index 00000000..d5798348 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,148 @@ +name: "haikuatelier.fr" +networks: + haiku-network: +services: + db: + container_name: "haikuatelier.fr-db" + env_file: + - path: "./.env" + required: true + healthcheck: + interval: "10s" + retries: 3 + start_period: "60s" + test: + - "CMD" + - "healthcheck.sh" + - "--connect" + - "--innodb_initialized" + timeout: "5s" + image: "docker.io/library/mariadb:latest" + labels: + - "traefik.enable=false" + networks: + - "haiku-network" + restart: "unless-stopped" + volumes: + - "db-data:/var/lib/mysql:rw" + jaeger: + container_name: "haikuatelier.fr-jaeger" + environment: + - "COLLECTOR_OTLP_ENABLED=true" + healthcheck: + interval: "5s" + retries: 3 + start_period: "5s" + test: + - "CMD" + - "wget" + - "--spider" + - "http://localhost:16686" + timeout: "2s" + image: "cr.jaegertracing.io/jaegertracing/jaeger:latest" + networks: + - "haiku-network" + ports: + - "6831:6831/udp" + - "6832:6832/udp" + - "5778:5778" + - "16686:16686" + - "4317:4317" + - "4318:4318" + - "14250:14250" + - "14268:14268" + - "14269:14269" + proxy: + container_name: "haikuatelier.fr-proxy" + depends_on: + - "wordpress" + env_file: + - path: "./.env" + required: true + healthcheck: + interval: "10s" + retries: 3 + test: + - "CMD-SHELL" + - "curl http://localhost/health | grep UP" + timeout: "5s" + image: "docker.io/eilandert/angie:latest" + networks: + - "haiku-network" + restart: "on-failure:3" + volumes: + - "./containers/conf/angie:/etc/angie:rw" + - "./containers/data/certs:/etc/angie/ssl:ro" + - "./containers/data/angie/logs:/var/log/angie:rw" + - "wordpress-data:/var/www/wordpress:ro" + traefik: + container_name: "haikuatelier.fr-traefik" + env_file: + - path: "./.env" + required: true + healthcheck: + interval: "10s" + retries: 3 + test: + - "CMD" + - "traefik" + - "healthcheck" + - "--ping" + timeout: "5s" + image: "traefik" + mem_limit: "256m" + mem_reservation: "128m" + networks: + - "haiku-network" + ports: + - "127.0.0.1:80:80" + - "127.0.0.1:443:443" + - "127.0.0.1:8082:8082" + restart: "unless-stopped" + volumes: + - "./containers/conf/traefik/dynamic:/etc/traefik/dynamic:ro" + - "./containers/conf/traefik/traefik.yaml:/etc/traefik/traefik.yml:ro" + - "./containers/data/certs:/etc/certs/:ro" + - "./containers/data/traefik/logs:/var/log/traefik:rw" + - "/var/run/user/1000/podman/podman.sock:/var/run/docker.sock:ro" + valkey: + command: "valkey-server /usr/local/etc/valkey/valkey.conf" + container_name: "haikuatelier.fr-valkey" + env_file: + - path: "./.env" + required: true + healthcheck: + interval: "10s" + retries: 3 + test: + - "CMD-SHELL" + - "valkey-cli ping | grep PONG" + timeout: "5s" + image: "docker.io/valkey/valkey:8-alpine" + restart: "unless-stopped" + sysctls: + - "net.core.somaxconn=512" + volumes: + - "./containers/conf/valkey.conf:/usr/local/etc/valkey/valkey.conf:ro" + - "./containers/data/valkey:/data:rw" + wordpress: + container_name: "haikuatelier.fr-wordpress" + depends_on: + - "db" + - "valkey" + - "traefik" + env_file: + - path: "./.env" + required: true + image: "localhost/wordpress-haiku-atelier" + networks: + - "haiku-network" + ports: + - "127.0.0.1:9000:9000" + restart: "unless-stopped" + volumes: + - "./containers/conf/php.ini:/usr/local/etc/php/conf.d/custom.ini:ro" + - "wordpress-data:/var/www/wordpress:rw" +volumes: + db-data: null + wordpress-data: null diff --git a/composer.lock b/composer.lock index dd72567d..e9c54919 100644 --- a/composer.lock +++ b/composer.lock @@ -3832,12 +3832,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "d2e1583e5f89f53f7882861c1639c14c9a154585" + "reference": "19966d2f97bbc444bb176432754e33256a7d45bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d2e1583e5f89f53f7882861c1639c14c9a154585", - "reference": "d2e1583e5f89f53f7882861c1639c14c9a154585", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/19966d2f97bbc444bb176432754e33256a7d45bf", + "reference": "19966d2f97bbc444bb176432754e33256a7d45bf", "shasum": "" }, "conflict": { @@ -4272,7 +4272,7 @@ "maikuolan/phpmussel": ">=1,<1.6", "mainwp/mainwp": "<=4.4.3.3", "manogi/nova-tiptap": "<=3.2.6", - "mantisbt/mantisbt": "<=2.26.3", + "mantisbt/mantisbt": "<2.27.2", "marcwillmann/turn": "<0.3.3", "marshmallow/nova-tiptap": "<5.7", "matomo/matomo": "<1.11", @@ -4360,7 +4360,7 @@ "open-web-analytics/open-web-analytics": "<1.8.1", "opencart/opencart": ">=0", "openid/php-openid": "<2.3", - "openmage/magento-lts": "<20.12.3", + "openmage/magento-lts": "<20.16", "opensolutions/vimbadmin": "<=3.0.15", "opensource-workshop/connect-cms": "<1.8.7|>=2,<2.4.7", "orchid/platform": ">=8,<14.43", @@ -4815,7 +4815,7 @@ "type": "tidelift" } ], - "time": "2025-10-30T18:07:16+00:00" + "time": "2025-11-03T21:05:38+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/containers/Dockerfile b/containers/Dockerfile index f145c906..54894c4a 100644 --- a/containers/Dockerfile +++ b/containers/Dockerfile @@ -2,15 +2,13 @@ FROM docker.io/library/alpine:latest AS repo # Ajoute Git. -RUN set -eux; \ - apk add --no-cache \ +RUN set -eux; apk add --no-cache \ bash \ git \ ; # Récupère les fichiers du site pour la branche « Production ». RUN git clone --branch production --depth 1 http://git.gcch.fr/gcch/haiku-atelier-2024.git "/tmp/repo" -RUN ls -la /tmp/repo FROM docker.io/library/wordpress:php8.4-fpm-alpine AS php ENTRYPOINT [] @@ -27,8 +25,7 @@ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli # Installe Composer. RUN php -r "copy('https://getcomposer.org/installer', './composer-setup.php');" && php ./composer-setup.php && mv composer.phar /usr/local/bin/composer && rm composer-setup.php -RUN set -eux; \ - apk add --no-cache \ +RUN set -eux; apk add --no-cache \ fish \ ghostscript \ imagemagick \ @@ -39,19 +36,10 @@ VOLUME /var/www/wordpress WORKDIR /var/www/wordpress # Récupère les fichiers du projet. -COPY --from=repo --chmod=777 \ - "/tmp/repo/" \ - # "/tmp/repo/config/" \ - # "/tmp/repo/web/" \ - # "/tmp/repo/composer.json" \ - # "/tmp/repo/composer.lock" \ - # "/tmp/repo/wp-cli.yml" \ - ./ -RUN ls -la +COPY --from=repo --chmod=777 "/tmp/repo/" . # Installe les dépendences Composer. RUN composer install -RUN ls -la EXPOSE 9000 CMD ["php-fpm"] diff --git a/containers/conf/angie/angie.conf b/containers/conf/angie/angie.conf new file mode 100755 index 00000000..405d5ae5 --- /dev/null +++ b/containers/conf/angie/angie.conf @@ -0,0 +1,56 @@ +worker_processes 1; +user root; + +# Modules +include /etc/angie/modules-enabled/*.conf; + +pcre_jit on; +pid /run/angie.pid; +error_log /dev/stdout info; + +events { + worker_connections 2048; + multi_accept on; + use epoll; +} + +http { + ############# Angie conf + include /etc/angie/mime.types; + include /etc/angie/compression.conf; + include /etc/angie/fastcgi.conf; + + error_log /dev/stdout info; + + aio threads; + aio_write on; + directio 256k; + sendfile on; + sendfile_max_chunk 256k; + server_names_hash_bucket_size 128; + tcp_nodelay on; + tcp_nopush on; + + http2 on; + + source_charset utf-8; # same value as "charset" + + ############## Let Angie see client real IPs + real_ip_header X-Forwarded-For; + set_real_ip_from traefik; + + ############## Angie security + client_body_buffer_size 10K; + client_body_timeout 12; + client_header_buffer_size 1k; + client_header_timeout 12; + client_max_body_size 8M; + keepalive_timeout 15; + large_client_header_buffers 4 8k; + proxy_hide_header X-Powered-By; + send_timeout 10; + server_tokens off; + + ############# WP conf + include /etc/angie/haikuatelier.conf; +} diff --git a/containers/conf/angie/angie.conf-original b/containers/conf/angie/angie.conf-original new file mode 100755 index 00000000..6627092f --- /dev/null +++ b/containers/conf/angie/angie.conf-original @@ -0,0 +1,117 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/angie.pid; + + +events { + worker_connections 1024; +} + + +http { + include 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 logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server { + listen 80; + server_name localhost; + + #charset koi8-r; + + #access_log logs/host.access.log main; + + location / { + root html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with Angie's one + # + #location ~ /\.ht { + # deny all; + #} + } + + + # another virtual host using mix of IP-, name-, and port-based configuration + # + #server { + # listen 8000; + # listen somename:8080; + # server_name somename alias another.alias; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + + + # HTTPS server + # + #server { + # listen 443 ssl; + # server_name localhost; + + # ssl_certificate cert.pem; + # ssl_certificate_key cert.key; + + # ssl_session_cache shared:SSL:1m; + # ssl_session_timeout 5m; + + # ssl_ciphers HIGH:!aNULL:!MD5; + # ssl_prefer_server_ciphers on; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + +} diff --git a/containers/conf/angie/angie.conf-packaged b/containers/conf/angie/angie.conf-packaged new file mode 100755 index 00000000..ec0db861 --- /dev/null +++ b/containers/conf/angie/angie.conf-packaged @@ -0,0 +1,201 @@ +### +## This file comes with the "Angie modules" on https://deb.paranoid.nl/angie-modules +## It contains various optimizations, examples and tweaks. +#### + +user www-data; + +worker_processes auto; +worker_rlimit_nofile 10000; + +pid /run/angie.pid; +include /etc/angie/modules-enabled/*.conf; + +pcre_jit on; + +events { + worker_connections 8192; # this can go as high as ulimit -n + multi_accept on; + use epoll; +} + +http { + + ## + # Basic Settings + ## + + aio threads; + aio_write on; + sendfile on; + directio 256k; + sendfile_max_chunk 256k; + + tcp_nopush on; + tcp_nodelay on; + + include /etc/angie/mime.types; + server_name_in_redirect off; # if off, angie will use the requested Host header + source_charset utf-8; # same value as "charset" + + + ### + ## Enable security_headers only if you installed/enabled the module + ### + # security_headers on; + + + ### + ## Enable other security headers. + ### + # hide_server_tokens on; + # fastcgi_hide_header X-Powered-By; + # server_tokens off; + + ## + # Optimizing TLS over TCP to reduce latency (Cloudflare patch) + ## + # ssl_dyn_rec_enable on; + + ## + # Enable HTTP2 and HTTP3 + # + http2 on; + #http3 on; + + ## + # SSL Settings + ## + + # Enable only if you are running on a openssl3 build and kernel 4.17 or higher + # You need to do `modprobe tls` to load the kernel TLS module + #ssl_conf_command Options KTLS; + + ssl_protocols TLSv1.3 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers EECDH+AESGCM:EDH+AESGCM; + + ssl_dhparam /etc/angie/dhparam.pem; + ssl_ecdh_curve secp521r1:secp384r1; + ssl_session_tickets off; + ssl_early_data on; + + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 1440m; + + # OCSP Stapling + # fetch OCSP records from URL in ssl_certificate and cache them + # Please enter your own nameservers for security + ssl_stapling on; + ssl_stapling_verify on; + resolver 1.1.1.1 8.8.8.8 valid=300; + + ## + # Logging Settings + ## + + ## Log Format + log_format main '$remote_addr $host $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $ssl_cipher $request_time'; + + access_log /var/log/angie/access.log; + error_log /var/log/angie/error.log; + + ## + # Gzip Settings + ## + gzip on; + gzip_vary on; + gzip_proxied any; + gzip_comp_level 6; + gzip_buffers 16 8k; + gzip_http_version 1.1; + gzip_min_length 250; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + ## + # Brotli settings (Please load module first!) + ## + #brotli on; + #brotli_comp_level 4; + #brotli_buffers 32 8k; + #brotli_min_length 1000; + #brotli_static on; + #brotli_types image/svg+xml text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript image/x-icon; + + ## + # ZSTD Settings (Please load module first!) + ## + #zstd on; + #zstd_min_length 256; # no less than 256 bytes + #zstd_comp_level 3; # set the level to # + #zstd_buffers 32 8k; + #zstd_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/ xml+rss text/javascript image/x-icon; + + + ### + ## Miscellaneous + ### + + # cache informations about FDs, frequently accessed files + # can boost performance, but you need to test those values + #open_file_cache max=200000 inactive=20s; + #open_file_cache_valid 30s; + #open_file_cache_min_uses 2; + #open_file_cache_errors on; + + server_names_hash_bucket_size 256; + server_names_hash_max_size 2048; + variables_hash_bucket_size 256; + variables_hash_max_size 2048; + map_hash_max_size 2048; + map_hash_bucket_size 256; + + #postpone_output 1440; # postpone sends to match our machine's MSS + read_ahead 512K; # kernel read head set to the output_buffers + output_buffers 4 512k; + + # Buffer size for POST submissions + client_body_buffer_size 80K; + client_max_body_size 16m; + + # Buffer size for Headers + client_header_buffer_size 1k; + + # Timeouts, do not keep connections open longer then necessary to reduce + # resource usage and deny Slowloris type attacks. + client_body_timeout 12; # maximum time between packets the client can pause when sending angie any data + client_header_timeout 12;# maximum time the client has to send the entire header to ngin + keepalive_timeout 15; # timeout which a single keep-alive client connection will stay open + keepalive_disable none; # allow all browsers to use keepalive connections + keepalive_requests 5000; # number of requests per connection, does not affect SPDY + reset_timedout_connection on; # Allow the server to close the connection after a client stops responding. + send_timeout 12; + + ## + # Virtual Host Configs + ## + + include /etc/angie/conf.d/*.conf; + include /etc/angie/sites-enabled/*; +} + +#mail { +# # See sample authentication script at: +# # http://wiki.angie.org/ImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +#} diff --git a/containers/conf/angie/compression.conf b/containers/conf/angie/compression.conf new file mode 100755 index 00000000..cc67c5c4 --- /dev/null +++ b/containers/conf/angie/compression.conf @@ -0,0 +1,102 @@ +gzip on; +gzip_comp_level 9; +gzip_http_version 1.1; +gzip_min_length 512; +gzip_buffers 32 4K; +gzip_proxied any; +gzip_vary on; +gzip_disable "msie6"; +gzip_static on; +gzip_types + application/atom+xml + application/geo+json + application/javascript + application/json + application/ld+json + application/manifest+json + application/rdf+xml + application/rss+xml + application/vnd.api+json + application/vnd.geo+json + application/vnd.ms-fontobject + application/x-font-opentype + application/x-font-truetype + application/x-font-ttf + application/x-javascript + application/x-web-app-manifest+json + application/xhtml+xml + application/xml + font/eot + font/opentype + font/otf + font/ttf + image/bmpg + image/svg+xml + image/vnd.microsoft.icon + image/x-icon + text/cache-manifest + text/css + text/html + text/javascript + text/plain + text/vcard + text/vnd.rim.location.xloc + text/vtt + text/x-component + text/x-cross-domain-policy + text/xml; + +brotli on; +brotli_buffers 32 4K; +brotli_comp_level 6; +brotli_min_length 1000; +brotli_static on; +brotli_types application/atom+xml application/javascript application/json application/vnd.api+json application/rss+xml + application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype + application/x-font-ttf application/x-javascript application/xhtml+xml application/xml + font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon + image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml; + +zstd on; +zstd_buffers 32 4K; +zstd_comp_level 3; +zstd_min_length 1000; +zstd_static on; +zstd_types + application/atom+xml + application/geo+json + application/javascript + application/json + application/ld+json + application/manifest+json + application/rdf+xml + application/rss+xml + application/vnd.api+json + application/vnd.geo+json + application/vnd.ms-fontobject + application/x-font-opentype + application/x-font-truetype + application/x-font-ttf + application/x-javascript + application/x-web-app-manifest+json + application/xhtml+xml + application/xml + font/eot + font/opentype + font/otf + font/ttf + image/bmpg + image/svg+xml + image/vnd.microsoft.icon + image/x-icon + text/cache-manifest + text/css + text/html + text/javascript + text/plain + text/vcard + text/vnd.rim.location.xloc + text/vtt + text/x-component + text/x-cross-domain-policy + text/xml; \ No newline at end of file diff --git a/containers/conf/angie/fastcgi.conf b/containers/conf/angie/fastcgi.conf new file mode 100755 index 00000000..d94c2480 --- /dev/null +++ b/containers/conf/angie/fastcgi.conf @@ -0,0 +1,20 @@ +fastcgi_param CONTENT_LENGTH $content_length; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REDIRECT_STATUS 200; +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_NAME $server_name; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_index index.php; diff --git a/containers/conf/angie/haikuatelier.conf b/containers/conf/angie/haikuatelier.conf new file mode 100755 index 00000000..cb1bd818 --- /dev/null +++ b/containers/conf/angie/haikuatelier.conf @@ -0,0 +1,52 @@ +server { + listen 80; + server_name _; + + root /var/www/wordpress/web; + index index.html index.php; + + access_log /var/log/angie/haikuatelier-access.log; + error_log /var/log/angie/haikuatelier-error.log; + + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + + # Point d'accès pour vérifier la santé du conteneur Angie. + location = /health { + access_log off; + add_header "Content-Type" "text/plain"; + return 200 "UP"; + } + + location = /robots.txt { + log_not_found off; + access_log off; + } + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location ~ \.php$ { + fastcgi_pass wordpress:9000; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + include /etc/angie/fastcgi.conf; + try_files $uri =404; + } + + location ~* .(jpg|jpeg|png|gif|ico|css|js)$ { + expires 365d; + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location * { + add_header "Access-Control-Allow-Methods" "GET, POST, OPTIONS"; + add_header "Access-Control-Allow-Origin" "*"; + add_header "Cross-Origin-Opener-Policy" "unsafe-none"; + add_header "Cross-Origin-Resource-Policy" "cross-origin"; + } +} diff --git a/containers/conf/angie/mime.types b/containers/conf/angie/mime.types new file mode 100755 index 00000000..1c00d701 --- /dev/null +++ b/containers/conf/angie/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/containers/conf/angie/modules-available/mod-http-access-plus.conf b/containers/conf/angie/modules-available/mod-http-access-plus.conf new file mode 100755 index 00000000..0c81e5b2 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-access-plus.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_access_plus_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-auth-ldap.conf b/containers/conf/angie/modules-available/mod-http-auth-ldap.conf new file mode 100755 index 00000000..e03d595f --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-auth-ldap.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_auth_ldap_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-auth-pam.conf b/containers/conf/angie/modules-available/mod-http-auth-pam.conf new file mode 100755 index 00000000..2eb67524 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-auth-pam.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_auth_pam_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-auth-spnego.conf b/containers/conf/angie/modules-available/mod-http-auth-spnego.conf new file mode 100755 index 00000000..cd73d988 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-auth-spnego.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_auth_spnego_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-brotli.conf b/containers/conf/angie/modules-available/mod-http-brotli.conf new file mode 100755 index 00000000..50f0014e --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-brotli.conf @@ -0,0 +1,2 @@ +load_module modules/ngx_http_brotli_filter_module.so; +load_module modules/ngx_http_brotli_static_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-cache-purge.conf b/containers/conf/angie/modules-available/mod-http-cache-purge.conf new file mode 100755 index 00000000..5974b1fa --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-cache-purge.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_cache_purge_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-captcha.conf b/containers/conf/angie/modules-available/mod-http-captcha.conf new file mode 100755 index 00000000..56aced51 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-captcha.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_captcha_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-concat.conf b/containers/conf/angie/modules-available/mod-http-concat.conf new file mode 100755 index 00000000..701a5c87 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-concat.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_concat_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-dav-ext.conf b/containers/conf/angie/modules-available/mod-http-dav-ext.conf new file mode 100755 index 00000000..e8523290 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-dav-ext.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_dav_ext_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-doh.conf b/containers/conf/angie/modules-available/mod-http-doh.conf new file mode 100755 index 00000000..c3a79dc1 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-doh.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_doh_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-dynamic-etag.conf b/containers/conf/angie/modules-available/mod-http-dynamic-etag.conf new file mode 100755 index 00000000..3e4e9301 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-dynamic-etag.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_dynamic_etag_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-early-hints.conf b/containers/conf/angie/modules-available/mod-http-early-hints.conf new file mode 100755 index 00000000..ef9dc0df --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-early-hints.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_early_hints_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-echo.conf b/containers/conf/angie/modules-available/mod-http-echo.conf new file mode 100755 index 00000000..a82ee29f --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-echo.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_echo_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-encrypted-session.conf b/containers/conf/angie/modules-available/mod-http-encrypted-session.conf new file mode 100755 index 00000000..ddea5ff3 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-encrypted-session.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_encrypted_session_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-eval.conf b/containers/conf/angie/modules-available/mod-http-eval.conf new file mode 100755 index 00000000..57eac6b4 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-eval.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_eval_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-fancyindex.conf b/containers/conf/angie/modules-available/mod-http-fancyindex.conf new file mode 100755 index 00000000..4aa4f2f2 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-fancyindex.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_fancyindex_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-flv-live.conf b/containers/conf/angie/modules-available/mod-http-flv-live.conf new file mode 100755 index 00000000..d4cdc560 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-flv-live.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_flv_live_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-geoip.conf b/containers/conf/angie/modules-available/mod-http-geoip.conf new file mode 100755 index 00000000..97219864 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-geoip.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_geoip_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-geoip2.conf b/containers/conf/angie/modules-available/mod-http-geoip2.conf new file mode 100755 index 00000000..9441b290 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-geoip2.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_geoip2_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-headers-more-filter.conf b/containers/conf/angie/modules-available/mod-http-headers-more-filter.conf new file mode 100755 index 00000000..266d84e7 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-headers-more-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_headers_more_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-image-filter.conf b/containers/conf/angie/modules-available/mod-http-image-filter.conf new file mode 100755 index 00000000..dfa29399 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-image-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_image_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-immutable.conf b/containers/conf/angie/modules-available/mod-http-immutable.conf new file mode 100755 index 00000000..ef075be3 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-immutable.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_immutable_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-js-challenge.conf b/containers/conf/angie/modules-available/mod-http-js-challenge.conf new file mode 100755 index 00000000..c0b7ec4a --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-js-challenge.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_js_challenge_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-length-hiding-filter.conf b/containers/conf/angie/modules-available/mod-http-length-hiding-filter.conf new file mode 100755 index 00000000..da1368c0 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-length-hiding-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_length_hiding_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-lua.conf b/containers/conf/angie/modules-available/mod-http-lua.conf new file mode 100755 index 00000000..f6311f46 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-lua.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_lua_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-modsecurity.conf b/containers/conf/angie/modules-available/mod-http-modsecurity.conf new file mode 100755 index 00000000..00547ce0 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-modsecurity.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_modsecurity_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-naxsi.conf b/containers/conf/angie/modules-available/mod-http-naxsi.conf new file mode 100755 index 00000000..8782889b --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-naxsi.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_naxsi_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-ndk.conf b/containers/conf/angie/modules-available/mod-http-ndk.conf new file mode 100755 index 00000000..3908af6d --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-ndk.conf @@ -0,0 +1 @@ +load_module modules/ndk_http_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-njs.conf b/containers/conf/angie/modules-available/mod-http-njs.conf new file mode 100755 index 00000000..9907c340 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-njs.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_js_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-perl.conf b/containers/conf/angie/modules-available/mod-http-perl.conf new file mode 100755 index 00000000..ab3d02ac --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-perl.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_perl_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-redis2.conf b/containers/conf/angie/modules-available/mod-http-redis2.conf new file mode 100755 index 00000000..35ac6b29 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-redis2.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_redis2_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-security-headers.conf b/containers/conf/angie/modules-available/mod-http-security-headers.conf new file mode 100755 index 00000000..d79d7752 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-security-headers.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_security_headers_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-set-misc.conf b/containers/conf/angie/modules-available/mod-http-set-misc.conf new file mode 100755 index 00000000..988c5cf2 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-set-misc.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_set_misc_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-subs-filter.conf b/containers/conf/angie/modules-available/mod-http-subs-filter.conf new file mode 100755 index 00000000..fe34b6c3 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-subs-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_subs_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-sysguard.conf b/containers/conf/angie/modules-available/mod-http-sysguard.conf new file mode 100755 index 00000000..631d10dc --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-sysguard.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_sysguard_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-testcookie-access.conf b/containers/conf/angie/modules-available/mod-http-testcookie-access.conf new file mode 100755 index 00000000..67a13a4b --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-testcookie-access.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_testcookie_access_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-trim-filter.conf b/containers/conf/angie/modules-available/mod-http-trim-filter.conf new file mode 100755 index 00000000..30cf8325 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-trim-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_trim_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-uploadprogress.conf b/containers/conf/angie/modules-available/mod-http-uploadprogress.conf new file mode 100755 index 00000000..edc0c0bb --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-uploadprogress.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_uploadprogress_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-upstream-fair.conf b/containers/conf/angie/modules-available/mod-http-upstream-fair.conf new file mode 100755 index 00000000..62750b5b --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-upstream-fair.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_upstream_fair_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-vhost-traffic-status.conf b/containers/conf/angie/modules-available/mod-http-vhost-traffic-status.conf new file mode 100755 index 00000000..ed80c2a3 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-vhost-traffic-status.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_vhost_traffic_status_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-waf.conf b/containers/conf/angie/modules-available/mod-http-waf.conf new file mode 100755 index 00000000..62bbec3d --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-waf.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_waf_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-xslt-filter.conf b/containers/conf/angie/modules-available/mod-http-xslt-filter.conf new file mode 100755 index 00000000..a4f87ac3 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-xslt-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_xslt_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-xss-filter.conf b/containers/conf/angie/modules-available/mod-http-xss-filter.conf new file mode 100755 index 00000000..0cfe4629 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-xss-filter.conf @@ -0,0 +1 @@ +load_module modules/ngx_http_xss_filter_module.so; diff --git a/containers/conf/angie/modules-available/mod-http-zstd.conf b/containers/conf/angie/modules-available/mod-http-zstd.conf new file mode 100755 index 00000000..9df29cb5 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-http-zstd.conf @@ -0,0 +1,2 @@ +load_module modules/ngx_http_zstd_filter_module.so; +load_module modules/ngx_http_zstd_static_module.so; diff --git a/containers/conf/angie/modules-available/mod-ipscrub.conf b/containers/conf/angie/modules-available/mod-ipscrub.conf new file mode 100755 index 00000000..0e69f7ce --- /dev/null +++ b/containers/conf/angie/modules-available/mod-ipscrub.conf @@ -0,0 +1 @@ +load_module modules/ngx_ipscrub_module.so; diff --git a/containers/conf/angie/modules-available/mod-mail.conf b/containers/conf/angie/modules-available/mod-mail.conf new file mode 100755 index 00000000..cfd4a4d2 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-mail.conf @@ -0,0 +1 @@ +load_module modules/ngx_mail_module.so; diff --git a/containers/conf/angie/modules-available/mod-nchan.conf b/containers/conf/angie/modules-available/mod-nchan.conf new file mode 100755 index 00000000..0a524e5f --- /dev/null +++ b/containers/conf/angie/modules-available/mod-nchan.conf @@ -0,0 +1 @@ +load_module modules/ngx_nchan_module.so; diff --git a/containers/conf/angie/modules-available/mod-pagespeed.conf b/containers/conf/angie/modules-available/mod-pagespeed.conf new file mode 100755 index 00000000..ee4be58c --- /dev/null +++ b/containers/conf/angie/modules-available/mod-pagespeed.conf @@ -0,0 +1 @@ +load_module modules/ngx_pagespeed.so; diff --git a/containers/conf/angie/modules-available/mod-stream-geoip.conf b/containers/conf/angie/modules-available/mod-stream-geoip.conf new file mode 100755 index 00000000..7195856a --- /dev/null +++ b/containers/conf/angie/modules-available/mod-stream-geoip.conf @@ -0,0 +1 @@ +load_module modules/ngx_stream_geoip_module.so; diff --git a/containers/conf/angie/modules-available/mod-stream-geoip2.conf b/containers/conf/angie/modules-available/mod-stream-geoip2.conf new file mode 100755 index 00000000..4072597a --- /dev/null +++ b/containers/conf/angie/modules-available/mod-stream-geoip2.conf @@ -0,0 +1 @@ +load_module modules/ngx_stream_geoip2_module.so; diff --git a/containers/conf/angie/modules-available/mod-stream-lua.conf b/containers/conf/angie/modules-available/mod-stream-lua.conf new file mode 100755 index 00000000..7983aceb --- /dev/null +++ b/containers/conf/angie/modules-available/mod-stream-lua.conf @@ -0,0 +1 @@ +load_module modules/ngx_stream_lua_module.so; diff --git a/containers/conf/angie/modules-available/mod-stream.conf b/containers/conf/angie/modules-available/mod-stream.conf new file mode 100755 index 00000000..f2b26578 --- /dev/null +++ b/containers/conf/angie/modules-available/mod-stream.conf @@ -0,0 +1 @@ +load_module modules/ngx_stream_module.so; diff --git a/containers/conf/angie/modules-enabled/50-mod-http-brotli.conf b/containers/conf/angie/modules-enabled/50-mod-http-brotli.conf new file mode 120000 index 00000000..03069e21 --- /dev/null +++ b/containers/conf/angie/modules-enabled/50-mod-http-brotli.conf @@ -0,0 +1 @@ +/usr/share/angie/modules-available/mod-http-brotli.conf \ No newline at end of file diff --git a/containers/conf/angie/modules-enabled/50-mod-http-dynamic-etag.conf b/containers/conf/angie/modules-enabled/50-mod-http-dynamic-etag.conf new file mode 120000 index 00000000..67d8c982 --- /dev/null +++ b/containers/conf/angie/modules-enabled/50-mod-http-dynamic-etag.conf @@ -0,0 +1 @@ +/usr/share/angie/modules-available/mod-http-dynamic-etag.conf \ No newline at end of file diff --git a/containers/conf/angie/modules-enabled/50-mod-http-headers-more-filter.conf b/containers/conf/angie/modules-enabled/50-mod-http-headers-more-filter.conf new file mode 120000 index 00000000..cbdeefd8 --- /dev/null +++ b/containers/conf/angie/modules-enabled/50-mod-http-headers-more-filter.conf @@ -0,0 +1 @@ +/usr/share/angie/modules-available/mod-http-headers-more-filter.conf \ No newline at end of file diff --git a/containers/conf/angie/modules-enabled/50-mod-http-zstd.conf b/containers/conf/angie/modules-enabled/50-mod-http-zstd.conf new file mode 120000 index 00000000..73507d0d --- /dev/null +++ b/containers/conf/angie/modules-enabled/50-mod-http-zstd.conf @@ -0,0 +1 @@ +/usr/share/angie/modules-available/mod-http-zstd.conf \ No newline at end of file diff --git a/containers/conf/angie/modules-enabled/99-mod-http-security-headers.conf b/containers/conf/angie/modules-enabled/99-mod-http-security-headers.conf new file mode 120000 index 00000000..5c6fee81 --- /dev/null +++ b/containers/conf/angie/modules-enabled/99-mod-http-security-headers.conf @@ -0,0 +1 @@ +/usr/share/angie/modules-available/mod-http-security-headers.conf \ No newline at end of file diff --git a/containers/conf/angie/scripts/cloudflare.sh b/containers/conf/angie/scripts/cloudflare.sh new file mode 100755 index 00000000..17cc0aa7 --- /dev/null +++ b/containers/conf/angie/scripts/cloudflare.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +CLOUDFLARE_FILE_PATH=/etc/nginx/snippets/cloudflare.conf + +echo "# Include this file in your vhost" > $CLOUDFLARE_FILE_PATH +echo "" >> $CLOUDFLARE_FILE_PATH + +for i in $(curl https://www.cloudflare.com/ips-v4); do + echo "set_real_ip_from $i;" >> $CLOUDFLARE_FILE_PATH +done +for i in $(curl https://www.cloudflare.com/ips-v6); do + echo "set_real_ip_from $i;" >> $CLOUDFLARE_FILE_PATH +done + +echo "" >> $CLOUDFLARE_FILE_PATH +echo "real_ip_header CF-Connecting-IP;" >> $CLOUDFLARE_FILE_PATH + +#test configuration and reload nginx +nginx -t && service nginx reload diff --git a/containers/conf/angie/scripts/reorder-modules.sh b/containers/conf/angie/scripts/reorder-modules.sh new file mode 100755 index 00000000..b6b05f13 --- /dev/null +++ b/containers/conf/angie/scripts/reorder-modules.sh @@ -0,0 +1,63 @@ +#/bin/bash + +# A simple script to priotize certain nginx modules in the right order. +# 2021-12-19 Thijs Eilander + +ETCPATH="/etc/angie/modules-enabled" +MODPATH="/usr/share/angie/modules-available" + +if [ -n "${MODULES}" ]; then + ${NGX_MODULES} = ${MODULES} +fi + +# Don't overwrite environment variable from e.g. docker +if [ ! -n "$NGX_MODULES" ]; then + cd ${ETCPATH} + NGX_MODULES=$(ls *.conf) +fi +rm ${ETCPATH}/*.conf + +# Remove extra spaces or delimiters from dockers environment +NGX_MODULES=$(echo "${NGX_MODULES}" | sed -e s/"[, ]"/" "/g) + +for MODULE in $NGX_MODULES; do + # Strip the .conf part + MODULE=$(echo "${MODULE}" | sed -e s/"\.conf$"//g) + # Preserve the filename for later user (rm) + MODULE_OLD=${MODULE} + # Strip existing priorities + MODULE=$(echo "${MODULE}" | sed -e s/"[0-9][0-9]\-"//g) + + PRIO="50" #DEFAULT + # Determine dependencies and priority + case ${MODULE} in + mod-http-ndk) PRIO="10" ;; + mod-stream) PRIO="15" ;; + mod-stream-lua) + ln -sf ${MODPATH}/mod-http-ndk.conf ${ETCPATH}/10-mod-http-ndk.conf + ln -sf ${MODPATH}/mod-stream.conf ${ETCPATH}/15-mod-stream.conf + ;; + mod-stream-*) ln -sf ${MODPATH}/mod-stream.conf ${ETCPATH}/15-mod-stream.conf ;; + mod-http-lua) ln -sf ${MODPATH}/mod-http-ndk.conf ${ETCPATH}/10-mod-http-ndk.conf ;; + mod-ssl-ct) PRIO="10" ;; + mod-http-ssl-ct) ln -sf ${MODPATH}/mod-ssl-ct.conf ${ETCPATH}/10-mod-ssl-ct.conf ;; + mod-security-headers) + MODULE="mod-http-security-headers" + PRIO="99" + ;; + mod-http-security-headers) PRIO="99" ;; + mod-modsecurity) MODULE="mod-http-modsecurity" ;; + mod-brotli) MODULE="mod-http-brotli" ;; + mod-naxsi) MODULE="mod-http-naxsi" ;; + mod-vts) MODULE="mod-http-vhost-traffic-status" ;; + esac + + rm -f ${ETCPATH}/${MODULE_OLD}.conf + + if [ -e "${MODPATH}/${MODULE}.conf" ]; then + ln -sf ${MODPATH}/${MODULE}.conf ${ETCPATH}/${PRIO}-${MODULE}.conf + else + echo "Warning: ${MODPATH}/${MODULE}.conf not found! Not making symlink" + fi + +done diff --git a/containers/conf/angie/snippets/bots-map.conf-example b/containers/conf/angie/snippets/bots-map.conf-example new file mode 100755 index 00000000..3bb64d7a --- /dev/null +++ b/containers/conf/angie/snippets/bots-map.conf-example @@ -0,0 +1,723 @@ +## Map user agent string +## Include this file in your serverblock +## Include bots.conf in your global config + +map $http_user_agent $bad_client { + default 0; + 01h4x.com 1; + 360Spider 1; + 404checker 1; + 404enemy 1; + 80legs 1; + ADmantX 1; + AIBOT 1; + ALittle\ 1; + Client 1; + ASPSeek 1; + Abonti 1; + Aboundex 1; + Aboundexbot 1; + Acunetix 1; + AdsTxtCrawlerTP 1; + AfD-Verbotsverfahren 1; + AhrefsBot 1; + AiHitBot 1; + Aipbot 1; + Alexibot 1; + AllSubmitter 1; + Alligator 1; + AlphaBot 1; + Anarchie 1; + Anarchy 1; + Anarchy99 1; + Ankit 1; + Anthill 1; + Apexoo 1; + Aspiegel 1; + Asterias 1; + Atomseobot 1; + Attach 1; + AwarioRssBot 1; + AwarioSmartBot 1; + BBBike 1; + BDCbot 1; + BDFetch 1; + BLEXBot 1; + BackDoorBot 1; + BackStreet 1; + BackWeb 1; + Backlink-Ceck 1; + BacklinkCrawler 1; + Badass 1; + Bandit 1; + Barkrowler 1; + BatchFTP 1; + Battleztar\ 1; + Bazinga 1; + BetaBot 1; + Bigfoot 1; + Bitacle 1; + BlackWidow 1; + Black\ 1; + Hole 1; + Blackboard 1; + Blow 1; + BlowFish 1; + Boardreader 1; + Bolt 1; + BotALot 1; + Brandprotect 1; + Brandwatch 1; + Buck 1; + Buddy 1; + BuiltBotTough 1; + BuiltWith 1; + Bullseye 1; + BunnySlippers 1; + BuzzSumo 1; + Bytespider 1; + CATExplorador 1; + CCBot 1; + CODE87 1; + CSHttp 1; + Calculon 1; + CazoodleBot 1; + Cegbfeieh 1; + CensysInspect 1; + CheTeam 1; + CheeseBot 1; + CherryPicker 1; + ChinaClaw 1; + Chlooe 1; + Citoid 1; + Claritybot 1; + Cliqzbot 1; + Cloud\ 1; + mapping 1; + Cocolyzebot 1; + Cogentbot 1; + Collector 1; + Copier 1; + CopyRightCheck 1; + Copyscape 1; + Cosmos 1; + Craftbot 1; + Crawling\ 1; + at\ 1; + Home\ 1; + Project 1; + CrazyWebCrawler 1; + Crescent 1; + CrunchBot 1; + Curious 1; + Custo 1; + CyotekWebCopy 1; + DBLBot 1; + DIIbot 1; + DSearch 1; + DTS\ 1; + Agent 1; + DataCha0s 1; + DatabaseDriverMysqli 1; + Demon 1; + Deusu 1; + Devil 1; + Digincore 1; + DigitalPebble 1; + Dirbuster 1; + Disco 1; + Discobot 1; + Discoverybot 1; + Dispatch 1; + DittoSpyder 1; + DnBCrawler-Analytics 1; + DnyzBot 1; + DomCopBot 1; + DomainAppender 1; + DomainCrawler 1; + DomainSigmaCrawler 1; + DomainStatsBot 1; + Domains\ 1; + Project 1; + Dotbot 1; + Download\ 1; + Wonder 1; + Dragonfly 1; + Drip 1; + ECCP/1.0 1; + EMail\ 1; + Siphon 1; + EMail\ 1; + Wolf 1; + EasyDL 1; + Ebingbong 1; + Ecxi 1; + EirGrabber 1; + EroCrawler 1; + Evil 1; + Exabot 1; + Express\ 1; + WebPictures 1; + ExtLinksBot 1; + Extractor 1; + ExtractorPro 1; + Extreme\ 1; + Picture\ 1; + Finder 1; + EyeNetIE 1; + Ezooms 1; + FDM 1; + FHscan 1; + FemtosearchBot 1; + Fimap 1; + Firefox/7.0 1; + FlashGet 1; + Flunky 1; + Foobot 1; + Freeuploader 1; + FrontPage 1; + Fuzz 1; + FyberSpider 1; + Fyrebot 1; + G-i-g-a-b-o-t 1; + GPTBot 1; + GT::WWW 1; + GalaxyBot 1; + Genieo 1; + GermCrawler 1; + GetRight 1; + GetWeb 1; + Getintent 1; + Gigabot 1; + Go!Zilla 1; + Go-Ahead-Got-It 1; + GoZilla 1; + Gotit 1; + GrabNet 1; + Grabber 1; + Grafula 1; + GrapeFX 1; + GrapeshotCrawler 1; + GridBot 1; + HEADMasterSEO 1; + HMView 1; + HTMLparser 1; + HTTP::Lite 1; + HTTrack 1; + Haansoft 1; + HaosouSpider 1; + Harvest 1; + Havij 1; + Heritrix 1; + Hloader 1; + HonoluluBot 1; + Humanlinks 1; + HybridBot 1; + IDBTE4M 1; + IDBot 1; + IRLbot 1; + Iblog 1; + Id-search 1; + IlseBot 1; + Image\ 1; + Fetch 1; + Image\ 1; + Sucker 1; + IndeedBot 1; + Indy\ 1; + Library 1; + InfoNaviRobot 1; + InfoTekies 1; + Intelliseek 1; + InterGET 1; + InternetSeer 1; + Internet\ 1; + Ninja 1; + Iria 1; + Iskanie 1; + IstellaBot 1; + JOC\ 1; + Web\ 1; + Spider 1; + JamesBOT 1; + Jbrofuzz 1; + JennyBot 1; + JetCar 1; + Jetty 1; + JikeSpider 1; + Joomla 1; + Jorgee 1; + JustView 1; + Jyxobot 1; + Kenjin\ 1; + Spider 1; + Keybot\ 1; + Translation-Search-Machine 1; + Keyword\ 1; + Density 1; + Kinza 1; + Kozmosbot 1; + LNSpiderguy 1; + LWP::Simple 1; + Lanshanbot 1; + Larbin 1; + Leap 1; + LeechFTP 1; + LeechGet 1; + LexiBot 1; + Lftp 1; + LibWeb 1; + Libwhisker 1; + LieBaoFast 1; + Lightspeedsystems 1; + Likse 1; + LinkScan 1; + LinkWalker 1; + Linkbot 1; + LinkextractorPro 1; + LinkpadBot 1; + LinksManager 1; + LinqiaMetadataDownloaderBot 1; + LinqiaRSSBot 1; + LinqiaScrapeBot 1; + Lipperhey 1; + Lipperhey\ 1; + Spider 1; + Litemage_walker 1; + Lmspider 1; + Ltx71 1; + MFC_Tear_Sample 1; + MIDown\ 1; + tool 1; + MIIxpc 1; + MJ12bot 1; + MQQBrowser 1; + MSFrontPage 1; + MSIECrawler 1; + MTRobot 1; + Mag-Net 1; + Magnet 1; + Mail.RU_Bot 1; + Majestic-SEO 1; + Majestic12 1; + Majestic\ 1; + SEO 1; + MarkMonitor 1; + MarkWatch 1; + Mass\ 1; + Downloader 1; + Masscan 1; + Mata\ 1; + Hari 1; + MauiBot 1; + Mb2345Browser 1; + MeanPath\ 1; + Bot 1; + Meanpathbot 1; + Mediatoolkitbot 1; + MegaIndex.ru 1; + Metauri 1; + MicroMessenger 1; + Microsoft\ 1; + Data\ 1; + Access 1; + Microsoft\ 1; + URL\ 1; + Control 1; + Minefield 1; + Mister\ 1; + PiX 1; + Moblie\ 1; + Safari 1; + Mojeek 1; + Mojolicious 1; + MolokaiBot 1; + Morfeus\ 1; + Fucking\ 1; + Scanner 1; + Mozlila 1; + Mr.4x3 1; + Msrabot 1; + Musobot 1; + NICErsPRO 1; + NPbot 1; + Name\ 1; + Intelligence 1; + Nameprotect 1; + Navroad 1; + NearSite 1; + Needle 1; + Nessus 1; + NetAnts 1; + NetLyzer 1; + NetMechanic 1; + NetSpider 1; + NetZIP 1; + Net\ 1; + Vampire 1; + Netcraft 1; + Nettrack 1; + Netvibes 1; + NextGenSearchBot 1; + Nibbler 1; + Niki-bot 1; + Nikto 1; + NimbleCrawler 1; + Nimbostratus 1; + Ninja 1; + Nmap 1; + Nuclei 1; + Nutch 1; + Octopus 1; + Offline\ 1; + Explorer 1; + Offline\ 1; + Navigator 1; + OnCrawl 1; + OpenLinkProfiler 1; + OpenVAS 1; + Openfind 1; + Openvas 1; + OrangeBot 1; + OrangeSpider 1; + OutclicksBot 1; + OutfoxBot 1; + PECL::HTTP 1; + PHPCrawl 1; + POE-Component-Client-HTTP 1; + PageAnalyzer 1; + PageGrabber 1; + PageScorer 1; + PageThing.com 1; + Page\ 1; + Analyzer 1; + Pandalytics 1; + Panscient 1; + Papa\ 1; + Foto 1; + Pavuk 1; + PeoplePal 1; + Petalbot 1; + Pi-Monster 1; + Picscout 1; + Picsearch 1; + PictureFinder 1; + Piepmatz 1; + Pimonster 1; + Pixray 1; + PleaseCrawl 1; + Pockey 1; + ProPowerBot 1; + ProWebWalker 1; + Probethenet 1; + Proximic 1; + Psbot 1; + Pu_iN 1; + Pump 1; + PxBroker 1; + PyCurl 1; + QueryN\ 1; + Metasearch 1; + Quick-Crawler 1; + RSSingBot 1; + Rainbot 1; + RankActive 1; + RankActiveLinkBot 1; + RankFlex 1; + RankingBot 1; + RankingBot2 1; + Rankivabot 1; + RankurBot 1; + Re-re 1; + ReGet 1; + RealDownload 1; + Reaper 1; + RebelMouse 1; + Recorder 1; + RedesScrapy 1; + RepoMonkey 1; + Ripper 1; + RocketCrawler 1; + Rogerbot 1; + SBIder 1; + SEOkicks 1; + SEOkicks-Robot 1; + SEOlyticsCrawler 1; + SEOprofiler 1; + SEOstats 1; + SISTRIX 1; + SMTBot 1; + SalesIntelligent 1; + ScanAlert 1; + Scanbot 1; + ScoutJet 1; + Scrapy 1; + Screaming 1; + ScreenerBot 1; + ScrepyBot 1; + Searchestate 1; + SearchmetricsBot 1; + Seekport 1; + SeekportBot 1; + SemanticJuice 1; + Semrush 1; + SemrushBot 1; + SentiBot 1; + SenutoBot 1; + SeoSiteCheckup 1; + SeobilityBot 1; + Seomoz 1; + Shodan 1; + Siphon 1; + SiteCheckerBotCrawler 1; + SiteExplorer 1; + SiteLockSpider 1; + SiteSnagger 1; + SiteSucker 1; + Site\ 1; + Sucker 1; + Sitebeam 1; + Siteimprove 1; + Sitevigil 1; + SlySearch 1; + SmartDownload 1; + Snake 1; + Snapbot 1; + Snoopy 1; + SocialRankIOBot 1; + Sociscraper 1; + Sogou\ 1; + web\ 1; + spider 1; + Sosospider 1; + Sottopop 1; + SpaceBison 1; + Spammen 1; + SpankBot 1; + Spanner 1; + Spbot 1; + Spinn3r 1; + SputnikBot 1; + Sqlmap 1; + Sqlworm 1; + Sqworm 1; + Steeler 1; + Stripper 1; + Sucker 1; + Sucuri 1; + SuperBot 1; + SuperHTTP 1; + Surfbot 1; + SurveyBot 1; + Suzuran 1; + Swiftbot 1; + Szukacz 1; + T0PHackTeam 1; + T8Abot 1; + Teleport 1; + TeleportPro 1; + Telesoft 1; + Telesphoreo 1; + Telesphorep 1; + TheNomad 1; + The\ 1; + Intraformant 1; + Thumbor 1; + TightTwatBot 1; + TinyTestBot 1; + Titan 1; + Toata 1; + Toweyabot 1; + Tracemyfile 1; + Trendiction 1; + Trendictionbot 1; + True_Robot 1; + Turingos 1; + Turnitin 1; + TurnitinBot 1; + TwengaBot 1; + Twice 1; + Typhoeus 1; + URLy.Warning 1; + URLy\ 1; + Warning 1; + UnisterBot 1; + Upflow 1; + V-BOT 1; + VB\ 1; + Project 1; + VCI 1; + Vacuum 1; + Vagabondo 1; + VelenPublicWebCrawler 1; + VeriCiteCrawler 1; + VidibleScraper 1; + Virusdie 1; + VoidEYE 1; + Voil 1; + Voltron 1; + WASALive-Bot 1; + WBSearchBot 1; + WEBDAV 1; + WISENutbot 1; + WPScan 1; + WWW-Collector-E 1; + WWW-Mechanize 1; + WWW::Mechanize 1; + WWWOFFLE 1; + Wallpapers 1; + Wallpapers/3.0 1; + WallpapersHD 1; + WeSEE 1; + WebAuto 1; + WebBandit 1; + WebCollage 1; + WebCopier 1; + WebEnhancer 1; + WebFetch 1; + WebFuck 1; + WebGo\ 1; + IS 1; + WebImageCollector 1; + WebLeacher 1; + WebPix 1; + WebReaper 1; + WebSauger 1; + WebStripper 1; + WebSucker 1; + WebWhacker 1; + WebZIP 1; + Web\ 1; + Auto 1; + Web\ 1; + Collage 1; + Web\ 1; + Enhancer 1; + Web\ 1; + Fetch 1; + Web\ 1; + Fuck 1; + Web\ 1; + Pix 1; + Web\ 1; + Sauger 1; + Web\ 1; + Sucker 1; + Webalta 1; + WebmasterWorldForumBot 1; + Webshag 1; + WebsiteExtractor 1; + WebsiteQuester 1; + Website\ 1; + Quester 1; + Webster 1; + Whack 1; + Whacker 1; + Whatweb 1; + Who.is\ 1; + Bot 1; + Widow 1; + WinHTTrack 1; + WiseGuys\ 1; + Robot 1; + Wonderbot 1; + Woobot 1; + Wotbox 1; + Wprecon 1; + Xaldon\ 1; + WebSpider 1; + Xaldon_WebSpider 1; + Xenu 1; + YoudaoBot 1; + Zade 1; + Zauba 1; + Zermelo 1; + Zeus 1; + Zitebot 1; + ZmEu 1; + ZoomBot 1; + ZoominfoBot 1; + ZumBot 1; + ZyBorg 1; + adscanner 1; + archive.org_bot 1; + arquivo-web-crawler 1; + arquivo.pt 1; + autoemailspider 1; + backlink-check 1; + cah.io.community 1; + check1.exe 1; + clark-crawler 1; + coccocbot 1; + cognitiveseo 1; + com.plumanalytics 1; + crawl.sogou.com 1; + crawler.feedback 1; + crawler4j 1; + dataforseo.com 1; + dataforseobot 1; + demandbase-bot 1; + domainsproject.org 1; + eCatch 1; + evc-batch 1; + facebookscraper 1; + gopher 1; + heritrix 1; + instabid 1; + internetVista\ 1; + monitor 1; + ips-agent 1; + isitwp.com 1; + iubenda-radar 1; + linkdexbot 1; + lwp-request 1; + lwp-trivial 1; + magpie-crawler 1; + meanpathbot 1; + mediawords 1; + muhstik-scan 1; + netEstate\ 1; + NE\ 1; + Crawler 1; + oBot 1; + openai 1; + openai.com 1; + page\ 1; + scorer 1; + pcBrowser 1; + plumanalytics 1; + polaris\ 1; + version 1; + probe-image-size 1; + ripz 1; + s1z.ru 1; + satoristudio.net 1; + scalaj-http 1; + scan.lol 1; + seobility 1; + seocompany.store 1; + seoscanners 1; + seostar 1; + serpstatbot 1; + sexsearcher 1; + sitechecker.pro 1; + siteripz 1; + sogouspider 1; + sp_auditbot 1; + spyfu 1; + sysscan 1; + tAkeOut 1; + trendiction.com 1; + trendiction.de 1; + ubermetrics-technologies.com 1; + voyagerx.com 1; + webgains-bot 1; + webmeup-crawler 1; + webpros.com 1; + webprosbot 1; + x09Mozilla 1; + x22Mozilla 1; + xpymep1.exe 1; + zauba.io 1; + zgrab 1; +} diff --git a/containers/conf/angie/snippets/bots.conf-example b/containers/conf/angie/snippets/bots.conf-example new file mode 100755 index 00000000..c1197e6b --- /dev/null +++ b/containers/conf/angie/snippets/bots.conf-example @@ -0,0 +1,20 @@ + + # Use this with maps.conf in nginx.conf + # include this in your vhost/location + + # Return Code 410 is special, it says the content is deleted, indexers *should* their content. + + #see maps.conf + if ($bad_client) { return 410; } + + # Tailored for Magento 1 and layered navigation + ## Dont let search bots to drill your website | exclude some args from indexing + #if ($args ~ ^(brand|cat|color|dir|from|limit|price|type|mode|size|manufacturer)=.+) { set $filters A; } + #if ($http_user_agent ~* "http|bot|crawl|spider|Google|bing|Yahoo|Yandex") { set $filters "${filters}B"; } + #if ($filters = AB) { return 410; } + + #uncomment this if you don't want to be indexed by google/yahoo/yandex/bing etc + #if ($http_user_agent ~* "Bot|Google|Bing|Yahoo|Yandex") { + # return 410; + #} + diff --git a/containers/conf/angie/snippets/cloudflare.conf b/containers/conf/angie/snippets/cloudflare.conf new file mode 100755 index 00000000..cb45f30d --- /dev/null +++ b/containers/conf/angie/snippets/cloudflare.conf @@ -0,0 +1,26 @@ +# Include this file in your vhost + +set_real_ip_from 173.245.48.0/20; +set_real_ip_from 103.21.244.0/22; +set_real_ip_from 103.22.200.0/22; +set_real_ip_from 103.31.4.0/22; +set_real_ip_from 141.101.64.0/18; +set_real_ip_from 108.162.192.0/18; +set_real_ip_from 190.93.240.0/20; +set_real_ip_from 188.114.96.0/20; +set_real_ip_from 197.234.240.0/22; +set_real_ip_from 198.41.128.0/17; +set_real_ip_from 162.158.0.0/15; +set_real_ip_from 104.16.0.0/13; +set_real_ip_from 104.24.0.0/14; +set_real_ip_from 172.64.0.0/13; +set_real_ip_from 131.0.72.0/22; +set_real_ip_from 2400:cb00::/32; +set_real_ip_from 2606:4700::/32; +set_real_ip_from 2803:f800::/32; +set_real_ip_from 2405:b500::/32; +set_real_ip_from 2405:8100::/32; +set_real_ip_from 2a06:98c0::/29; +set_real_ip_from 2c0f:f248::/32; + +real_ip_header CF-Connecting-IP; diff --git a/containers/conf/angie/snippets/fastcgi-php.conf b/containers/conf/angie/snippets/fastcgi-php.conf new file mode 100755 index 00000000..467a9e73 --- /dev/null +++ b/containers/conf/angie/snippets/fastcgi-php.conf @@ -0,0 +1,13 @@ +# regex to split $uri to $fastcgi_script_name and $fastcgi_path +fastcgi_split_path_info ^(.+?\.php)(/.*)$; + +# Check that the PHP script exists before passing it +try_files $fastcgi_script_name =404; + +# Bypass the fact that try_files resets $fastcgi_path_info +# see: http://trac.nginx.org/nginx/ticket/321 +set $path_info $fastcgi_path_info; +fastcgi_param PATH_INFO $path_info; + +fastcgi_index index.php; +include fastcgi.conf; diff --git a/containers/conf/angie/snippets/http3.txt b/containers/conf/angie/snippets/http3.txt new file mode 100755 index 00000000..da2ecb4f --- /dev/null +++ b/containers/conf/angie/snippets/http3.txt @@ -0,0 +1,14 @@ + +So, you want http3? + +This is a quick & dirty howto. + +1. Open port 443/udp to your nginx instance +2. Put http3 on; in nginx.conf. (and additional http2 on; but not required) +3. Add Listen 443 quic; to your ssl interface +4. Put the following in your serverblock (in location /) add_header Alt-Svc 'h3=":443"'; # Advertise that HTTP/3 is available +5. Check with nginx -t if everything is alright +6. Restart nginx +7. Check with curl or an online http3 checker + +Please note, the nginx from http://deb.myguard.nl is compiled with OpenSSL3.0.x+quic, you should install the custom OpenSSL from deb.myguard.nl as well if not done automaticly. diff --git a/containers/conf/angie/snippets/letsencrypt-redirect.conf b/containers/conf/angie/snippets/letsencrypt-redirect.conf new file mode 100755 index 00000000..d912a368 --- /dev/null +++ b/containers/conf/angie/snippets/letsencrypt-redirect.conf @@ -0,0 +1,48 @@ +############################################################################# +# Configuration file for Let's Encrypt ACME Challenge location +# This file is already included in listen_xxx.conf files. +# Do NOT include it separately! +############################################################################# +# +# This config enables to access /.well-known/acme-challenge/xxxxxxxxxxx +# on all our sites (HTTP), including all subdomains. +# This is required by ACME Challenge (webroot authentication). +# You can check that this location is working by placing ping.txt here: +# /var/www/letsencrypt/.well-known/acme-challenge/ping.txt +# And pointing your browser to: +# http://xxx.domain.tld/.well-known/acme-challenge/ping.txt +# +# Sources: +# https://community.letsencrypt.org/t/howto-easy-cert-generation-and-renewal-with-nginx/3491 +# +############################################################################# + +# Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx) +# We use ^~ here, so that we don't check other regexes (for speed-up). We actually MUST cancel +# other regex checks, because in our other config files have regex rule that denies access to files with dotted names. +location ^~ /.well-known/acme-challenge/ { + + allow all; + auth_basic off; + + # Set correct content type. According to this: + # https://community.letsencrypt.org/t/using-the-webroot-domain-verification-method/1445/29 + # Current specification requires "text/plain" or no content header at all. + # It seems that "text/plain" is a safe option. + default_type "text/plain"; + + # This directory must be the same as in /etc/letsencrypt/cli.ini + # as "webroot-path" parameter. Also don't forget to set "authenticator" parameter + # there to "webroot". + # Do NOT use alias, use root! Target directory is located here: + # /var/www/common/letsencrypt/.well-known/acme-challenge/ + root /var/www/html; + + } + + # Hide /acme-challenge subdirectory and return 404 on all requests. + # It is somewhat more secure than letting Nginx return 403. + # Ending slash is important! + # location = /.well-known/acme-challenge/ { + # return 404; + # } diff --git a/containers/conf/angie/snippets/libmodsecurity-global.conf.example b/containers/conf/angie/snippets/libmodsecurity-global.conf.example new file mode 100755 index 00000000..7e1c0a6f --- /dev/null +++ b/containers/conf/angie/snippets/libmodsecurity-global.conf.example @@ -0,0 +1,91 @@ +modsecurity on; + +modsecurity_rules ' + SecRuleEngine On + #SecDebugLog /tmp/modsec_debug.log + #SecDebugLogLevel 9 + #SecRuleRemoveById 10 + #SecDataDir /var/cache/modsecurity + '; + + +modsecurity_rules_file /etc/modsecurity/modsecurity.conf; +modsecurity_rules_file /etc/modsecurity/ownrules.conf; + +#CRS +#modsecurity_rules_file /etc/modsecurity/crs/crs-setup.conf; +#modsecurity_rules_file /etc/modsecurity/crs/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-901-INITIALIZATION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-903.9001-DRUPAL-EXCLUSION-RULES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-903.9002-WORDPRESS-EXCLUSION-RULES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-903.9003-NEXTCLOUD-EXCLUSION-RULES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-903.9004-DOKUWIKI-EXCLUSION-RULES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-903.9005-CPANEL-EXCLUSION-RULES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-905-COMMON-EXCEPTIONS.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-910-IP-REPUTATION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-911-METHOD-ENFORCEMENT.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-912-DOS-PROTECTION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-913-SCANNER-DETECTION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-920-PROTOCOL-ENFORCEMENT.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-921-PROTOCOL-ATTACK.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-930-APPLICATION-ATTACK-LFI.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-931-APPLICATION-ATTACK-RFI.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-932-APPLICATION-ATTACK-RCE.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-933-APPLICATION-ATTACK-PHP.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-941-APPLICATION-ATTACK-XSS.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-942-APPLICATION-ATTACK-SQLI.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-943-APPLICATION-ATTACK-SESSION-FIXATION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-944-APPLICATION-ATTACK-JAVA.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/REQUEST-949-BLOCKING-EVALUATION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-950-DATA-LEAKAGES.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-951-DATA-LEAKAGES-SQL.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-952-DATA-LEAKAGES-JAVA.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-953-DATA-LEAKAGES-PHP.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-954-DATA-LEAKAGES-IIS.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-959-BLOCKING-EVALUATION.conf; +#modsecurity_rules_file /usr/share/modsecurity-crs/RESPONSE-980-CORRELATION.conf; +#modsecurity_rules_file /etc/modsecurity/crs/RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf; + +# +##https://waf.comodo.com/ +# +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/00_Init_Initialization.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/01_Init_AppsInitialization.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/02_Global_Generic.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/03_Global_Agents.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/04_Global_Domains.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/05_Global_Incoming.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/06_Global_Backdoor.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/07_XSS_XSS.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/08_Global_Other.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/09_Bruteforce_Bruteforce.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/10_HTTP_HTTP.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/11_HTTP_HTTPDoS.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/12_HTTP_Protocol.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/13_HTTP_Request.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/14_Outgoing_FilterGen.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/15_Outgoing_FilterASP.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/16_Outgoing_FilterPHP.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/17_Outgoing_FilterSQL.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/18_Outgoing_FilterOther.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/19_Outgoing_FilterInFrame.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/20_Outgoing_FiltersEnd.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/21_PHP_PHPGen.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/22_SQL_SQLi.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/23_ROR_RORGen.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/24_Apps_Joomla.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/25_Apps_JComponent.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/26_Apps_WordPress.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/27_Apps_WPPlugin.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/28_Apps_WHMCS.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/29_Apps_Drupal.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/30_Apps_OtherApps.conf; +#modsecurity_rules_file /etc/modsecurity/cwaf/rules/categories.conf; + + +#https://github.com/Rev3rseSecurity/wordpress-modsecurity-ruleset +#modsecurity_rules_file /etc/modsecurity/wordpress-modsecurity-ruleset/01-SETUP.conf; +#modsecurity_rules_file /etc/modsecurity/wordpress-modsecurity-ruleset/02-INITIALIZATION.conf; +#modsecurity_rules_file /etc/modsecurity/wordpress-modsecurity-ruleset/03-BRUTEFORCE.conf; +#modsecurity_rules_file /etc/modsecurity/wordpress-modsecurity-ruleset/04-EVENTS.conf; +#modsecurity_rules_file /etc/modsecurity/wordpress-modsecurity-ruleset/05-HARDENING.conf; diff --git a/containers/conf/angie/snippets/lua.conf-example b/containers/conf/angie/snippets/lua.conf-example new file mode 100755 index 00000000..17e2ee21 --- /dev/null +++ b/containers/conf/angie/snippets/lua.conf-example @@ -0,0 +1,10 @@ + +# When using openresty's lua, you have to include this in your http {} block + +lua_package_path "/usr/share/lua/5.1/?.lua;;"; + +init_by_lua_block { + require "resty.core" + collectgarbage("collect") -- just to collect any garbage +} + diff --git a/containers/conf/angie/snippets/nginx_module_vts.conf-example b/containers/conf/angie/snippets/nginx_module_vts.conf-example new file mode 100755 index 00000000..5abc9abc --- /dev/null +++ b/containers/conf/angie/snippets/nginx_module_vts.conf-example @@ -0,0 +1,3 @@ +see https://github.com/vozlt/nginx-module-vts/ + +If you want to contribute a sane config, please submit it diff --git a/containers/conf/angie/snippets/proxy.conf-example b/containers/conf/angie/snippets/proxy.conf-example new file mode 100755 index 00000000..83a344a4 --- /dev/null +++ b/containers/conf/angie/snippets/proxy.conf-example @@ -0,0 +1,35 @@ +#include this in the location of your vhost you want to proxy + +proxy_set_header Host $host; +proxy_set_header Scheme $scheme; +proxy_set_header X-Forwarded-For $remote_addr; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-Forwarded-Host $http_host; +proxy_set_header REMOTE_ADDR $remote_addr; +proxy_set_header HTTP_CF_CONNECTING_IP $remote_addr; +proxy_set_header Early-Data $ssl_early_data; + +add_header Front-End-Https on; + +proxy_redirect off; +proxy_buffering off; + +proxy_buffer_size 128k; +proxy_buffers 4 256k; +proxy_busy_buffers_size 256k; + +proxy_ssl_verify off; +proxy_ssl_session_reuse on; +proxy_ssl_protocols TLSv1.3 TLSv1.2; + +# WebSocket stuff +proxy_http_version 1.1; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Connection "upgrade"; + +# Prevent application/json content from being cached (Breaks nzbget and possibly others) +# more_set_headers -t "application/json" "Last-Modified $date_gmt"; +# more_set_headers -t "application/json" "Expect-CT 'max-age=0; enforce'"; +# more_set_headers -t "application/json" "Cache-Control 'no-transform, no-store, no-cache, must-revalidate, proxy-revalidate, public, max-age=0'"; +# more_clear_headers -t "application/json" 'etag:*'; + diff --git a/containers/conf/angie/snippets/security.conf-example b/containers/conf/angie/snippets/security.conf-example new file mode 100755 index 00000000..e3da1850 --- /dev/null +++ b/containers/conf/angie/snippets/security.conf-example @@ -0,0 +1,129 @@ + # Remove X-Powered-By, which is an information leak + fastcgi_hide_header X-Powered-By; + ignore_invalid_headers on; + + location ~ /robots.txt { allow all; } + location ~ /sitemap*xml { allow all; } + + # Disallow scripts + location ~* \.(pl|cgi|py|sh|lua)$ { return 404; } + + # Skip .git, .htpasswd etc and all dirs starting with . + location ~ (^|/)\. { return 404; } + + #hide all dirs with synology diskstation stuff + location ~ /DS_Store/ { return 404; } + + # Help guard against SQL injection + location ~* .(\;|'|\"|%22).*(request|insert|union|declare|drop)$ { return 404; } + + #Disallow access to sensitive files + location ~ /(\.|wp-config.php|readme.html|license.txt|nginx.conf|wp-config-sample.php|readme.txt|dbconfig.php) { + deny all; + } + + location ~ ^/([^/])+\.(orig$|conf$|git$) { return 404; } + location ~ /db.(conf|php|inc)|config.(xml|php|inc|ini)/ { return 404; } + + # Disallow common hacks + location ~* .(display_errors|set_time_limit|allow_url_include.*disable_functions.*open_basedir|set_magic_quotes_runtime|webconfig.txt.php|file_put_contentssever_root|wlwmanifest) { + deny all; + } + + location ~* .(env|globals|encode|localhost|loopback|xmlrpc|revslider) { + deny all; + } + + # Forbidden file extensions. + # Guards against unintended exposure of development/configuration files. + # stolen from modsecurity-crs + + location ~ ^/([^/])+\.(asa$|asax$|ascx$|axd$|backup$|bak$|bat$|cdx$|cer$|cfg$|cmd$|com$|config$|conf$|cs$|csproj$|csr$|dat$|db$/.dbf$|dll$|dos$|htr$|htw$|ida$|idc|idq$|inc$|ini$|key|licx$|lnk$|log$|mdb$|old$|pass$|pdb$|pol$|printer$|pwd$|resources$|resx$|sql$|sys$|vb$|vbs$|vbproj$|vsdisco$|webinfo$|xsd$|xsx$) { + return 404; + } + + # Hide /acme-challenge subdirectory and return 404 on all requests. + # It is somewhat more secure than letting Nginx return 403. + # Ending slash is important! + location = /.well-known/acme-challenge/ { + return 404; + } + + # Wordpress, remove any php handler + location ~ ^/wp-content/uploads/([^/])+\.php { return 404; } + location ~ ^/wp\-includes(/.*\.php(|[\/].*)|(|\/))$ { return 404; } + location ~ ^/wp-content(/.*\.txt(|[\/].*)|(|\/))$ { return 404; } + location ~ ^/wp-admin/(?:install|includes) { return 404; } + location ~ ^/(?:readme|license)\. { return 404; } + location ~ ^/wp-admin/(load\-styles|load\-scripts)\.php.*load\[\]\=([^&,]*,){20,} { return 404; } + location ~ ^(/wp-json/wp/v[0-9]+/users) { return 404; } + + # + # MAGENTO 1 + # + # Denied locations require a "^~" to prevent regexes (such as the PHP handler below) from matching + # http://nginx.org/en/docs/http/ngx_http_core_module.html#location + location /shell/ { deny all; } + location /cgi-bin/ { deny all; } + location /install.(php|txt) { deny all; } + location /license.(php|txt) { deny all; } + location ^~ /app/ { return 404; } + location ^~ /includes/ { return 404; } + location ^~ /media/downloadable/ { return 404; } + location ^~ /pkginfo/ { return 404; } + location ^~ /report/config.xml { return 404; } + location ^~ /var/ { return 404; } + location ^~ /lib/ { return 404; } + location ^~ /dev/ { return 404; } + location ^~ /RELEASE_NOTES.txt { return 404; } + location ^~ /downloader/pearlib { return 404; } + location ^~ /downloader/template { return 404; } + location ^~ /downloader/Maged { return 404; } + location ~* ^/errors/.+\.xml { return 404; } + + location ~* /rss/order/new { return 403; } + location ~* /rss/catalog/notifystock { return 403; } + location ~* /rss/catalog/review { return 403; } + + # Disallow PHP scripts in /media/ etc + # Also render static 404 pages for missing media + location ~ ^/(tmp|lib|media|shell|skin)/ { + location ~ \.php$ { + return 404; + } + try_files $uri $uri/ =404; + } + + # Don't skip .thumbs, this is a default directory where Magento places thumbnails + # Nginx cannot "not" match something, instead the target is matched with an empty block + # http://stackoverflow.com/a/16304073 + location ~ /\.thumbs { } + + #location ~ /var/export { + # satisfy all; + # allow 1.2.3.4; + # deny all; + # auth_basic "Restricted"; + # auth_basic_user_file .htpasswd; + # autoindex off; + # } + + + #taken from logfiles + location ~* /(magento_version|util\/login.aspx|/install.php) { return 404; } + + + #be carefull with ifs!! + + #only allow the standard methods. + if ($request_method !~ ^(GET|HEAD|POST)$ ) { return 404; } + + # Note the .+ at the start: We want to allow url's like + # order=create_date, which would otherwise match. + #if ($arg_order ~* .+(select|create|insert|update|drop|delete|concat|alter|load)) { return 404; } + + # CVE-2015-3428 / AW_Blog vulnerability + # Note the .+ at the start: We want to allow url's like + # order=create_date, which would otherwise match. + #if ($arg_order ~* .+(select|create|insert|update|drop|delete|concat|alter|load)) { return 404; } + diff --git a/containers/conf/angie/snippets/snakeoil.conf b/containers/conf/angie/snippets/snakeoil.conf new file mode 100755 index 00000000..ad26c3e2 --- /dev/null +++ b/containers/conf/angie/snippets/snakeoil.conf @@ -0,0 +1,5 @@ +# Self signed certificates generated by the ssl-cert package +# Don't use them in a production server! + +ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; +ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; diff --git a/containers/conf/angie/snippets/wordpress-example.conf b/containers/conf/angie/snippets/wordpress-example.conf new file mode 100755 index 00000000..3311d310 --- /dev/null +++ b/containers/conf/angie/snippets/wordpress-example.conf @@ -0,0 +1,124 @@ +# +# A sample .conf file for enhancing wordpress security +# Include this file in your wordpress vhost +# + +# httpblock: limit_req_zone $binary_remote_addr zone=WPRATELIMIT:10m rate=2r/s; +location ~ \wp-login.php$ { + limit_req zone=WPRATELIMIT; +} + +location = /favicon.ico { + log_not_found off; + access_log off; +} + +location = /robots.txt { + allow all; +# log_not_found off; +# access_log off; +} + +location ~ /\. { + deny all; +} + +#Deny access to wp-content folders for suspicious files +location ~* ^/(wp-content)/(.*?)\.(zip|gz|tar|bzip2|7z|sql|bak|txt|orig|confbak|log|old|orig|original|php#|php~|php_bak|save|swo|swp)\$ { + deny all; +} + +location ~ ^/wp-content/uploads/sucuri { + deny all; +} + +location ~ ^/wp-content/updraft { + deny all; +} + +# nginx block wpscann on plugins folder +location ~* ^/wp-content/plugins/.+\.(txt|log|md)$ { + deny all; + error_page 403 =404 / ; +} + +# block access to install.php and upgrade.php +location ^~ /wp-admin/install.php { + deny all; + error_page 403 =404 / ; +} + +location ^~ /wp-admin/upgrade.php { + deny all; + error_page 403 =404 / ; +} + +# Stop scann for the follow files on themes folder +location ~* ^/wp-content/themes/.+\.(txt|log|md)$ { + deny all; + error_page 403 =404 / ; +} + +#Disable execution of scripts other than PHP from your document root +location ~* .(pl|cgi|py|sh|lua|asp)$ { + return 444; +} + +#Disable access to your configuration files and other files that you don’t want to users are able to see +location ~* /(wp-config.php|readme.html|license.txt|nginx.conf) { + deny all; +} + +# Disable wp-config.txt +location = /wp-config.txt { + deny all; + access_log off; + log_not_found off; +} + +location ~* /xmlrpc.php$ { + allow 172.30.0.0/16; + deny all; +} + +if ($request_method !~ ^(GET|POST|HEAD)$ ) { + return 444; +} + +# Deny access to uploads that aren’t images, videos, music, etc. +location ~* ^/wp-content/uploads/.*.(html|htm|shtml|php|js|swf)$ { + deny all; +} + +location ~* /(?:uploads|files|wp-content|wp-includes|akismet)/.*.php$ { + deny all; + # access_log off; + # log_not_found off; +} + +location ~ /\.(svn|git)/* { + deny all; + access_log off; + log_not_found off; +} +location ~ /\.ht { + deny all; + access_log off; + log_not_found off; +} +location ~ /\.user.ini { + deny all; + access_log off; + log_not_found off; +} + +#location ~ ^/(?!(blog)/?) { +# deny all; +# access_log off; +# log_not_found off; +#} + +# PLUGINS : Enable Rewrite Rules for Yoast SEO SiteMap +# rewrite ^/sitemap_index\.xml$ /index.php?sitemap=1 last; +# rewrite ^/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last; + diff --git a/containers/conf/php.ini b/containers/conf/php.ini new file mode 100755 index 00000000..e76c33fe --- /dev/null +++ b/containers/conf/php.ini @@ -0,0 +1,14 @@ +allow_url_fopen = 0 +allow_url_include = 0 +cgi.fix_pathinfo = 0 +display_errors = 0 +display_startup_errors = 0 +expose_php = 0 +file_uploads = On +max_execution_time = 600 +max_input_time = 600 +max_input_vars = 2000 +memory_limit = 1024M +post_max_size = 32M +register_globals = Off +upload_max_filesize = 32M diff --git a/containers/conf/traefik/dynamic/certs.yaml b/containers/conf/traefik/dynamic/certs.yaml new file mode 100755 index 00000000..94f0d277 --- /dev/null +++ b/containers/conf/traefik/dynamic/certs.yaml @@ -0,0 +1,7 @@ +--- +# yaml-language-server: $schema=https://www.schemastore.org/traefik-v3.json + +tls: + certificates: + - certFile: "/etc/certs/_wildcard.gcch.local.pem" + keyFile: "/etc/certs/_wildcard.gcch.local-key.pem" diff --git a/containers/conf/traefik/dynamic/general.yaml b/containers/conf/traefik/dynamic/general.yaml new file mode 100755 index 00000000..85f608b2 --- /dev/null +++ b/containers/conf/traefik/dynamic/general.yaml @@ -0,0 +1,59 @@ +--- +# yaml-language-server: $schema=https://www.schemastore.org/traefik-v3.json + +http: + middlewares: + compression: + compress: + excludedContentTypes: + - text/event-stream + + security: + headers: + accessControlAllowCredentials: true + accessControlAllowHeaders: "content-type" + accessControlAllowMethods: + - GET + - OPTIONS + - POST + - PUT + accessControlAllowOriginListRegex: "https://.*\\.gcch\\.local(.*)" + accessControlMaxAge: 100 + addVaryHeader: true + browserXssFilter: true + contentTypeNosniff: true + customFrameOptionsValue: SAMEORIGIN + featurePolicy: "camera 'none'; microphone 'none'; payment 'none'; usb 'none'; vr 'none'; vibrate 'self';" + forceSTSHeader: false + frameDeny: true + hostsProxyHeaders: + - "X-Forwarded-Host" + isDevelopment: true + referrerPolicy: "origin" + stsPreload: true + stsSeconds: 315360000 + +tls: + options: + default: + alpnProtocols: + - h2 + - http/1.1 + cipherSuites: + - TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 + - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 + - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 + - TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 + - TLS_AES_128_GCM_SHA256 + - TLS_AES_256_GCM_SHA384 + - TLS_CHACHA20_POLY1305_SHA256 + curvePreferences: + - CurveP521 + - CurveP384 + minVersion: VersionTLS12 + sniStrict: true + + mintls13: + minVersion: VersionTLS13 diff --git a/containers/conf/traefik/dynamic/routers.yaml b/containers/conf/traefik/dynamic/routers.yaml new file mode 100755 index 00000000..85ca7157 --- /dev/null +++ b/containers/conf/traefik/dynamic/routers.yaml @@ -0,0 +1,48 @@ +--- +# yaml-language-server: $schema=https://www.schemastore.org/traefik-v3.json + +http: + routers: + haikuatelier: + entryPoints: + - websecure + middlewares: + - compression + - security + rule: Host(`haikuatelier.gcch.local`) + service: service-haikuatelier + tls: true + + jaeger: + entryPoints: + - websecure + middlewares: + - compression + - security + rule: Host(`jaeger.gcch.local`) + service: service-jaeger + tls: true + + jaeger-http: + entryPoints: + - websecure + middlewares: + - compression + - security + rule: Host(`jaeger-http.gcch.local`) + service: service-jaeger-http + tls: true + + monitor: + entryPoints: + - websecure + rule: Host(`monitor.gcch.local`) + service: api@internal + tls: true + + whoami: + entryPoints: + - websecure + rule: Host(`gcch.local`) + service: service-whoami + tls: true diff --git a/containers/conf/traefik/dynamic/services.yaml b/containers/conf/traefik/dynamic/services.yaml new file mode 100755 index 00000000..2fa8eb71 --- /dev/null +++ b/containers/conf/traefik/dynamic/services.yaml @@ -0,0 +1,24 @@ +--- +# yaml-language-server: $schema=https://www.schemastore.org/traefik-v3.json + +http: + services: + service-haikuatelier: + loadBalancer: + servers: + - url: "http://proxy:80" + + service-jaeger: + loadBalancer: + servers: + - url: "http://jaeger:16686" + + service-jaeger-http: + loadBalancer: + servers: + - url: "http://jaeger:4318" + + service-whoami: + loadBalancer: + servers: + - url: "http://whoami" diff --git a/containers/conf/traefik/traefik.yaml b/containers/conf/traefik/traefik.yaml new file mode 100755 index 00000000..df73f836 --- /dev/null +++ b/containers/conf/traefik/traefik.yaml @@ -0,0 +1,60 @@ +--- +# yaml-language-server: $schema=https://www.schemastore.org/traefik-v3.json + +accessLog: + # Journalise l'accès aux ressources internes. + addInternals: false + # Chemin du fichier où les journaux seront enregistrés. + bufferingSize: 100 + # Format des journaux. + filePath: "/var/log/traefik/access_log.log" + # Créé un buffer de n lignes avant d'écrire les journaux. Permet de journaliser de manière asynchrone. + format: "common" + +api: + # Active le tableau de bord Traefik. + dashboard: true + # Active des points d'accès de déboguage. + debug: false + # Rend l'API directement disponible sans sécurisation. + insecure: true + +entryPoints: + ping: + address: ":8082" + web: + address: ":80" + http: + redirections: + entryPoint: + scheme: https + to: websecure + websecure: + address: ":443" + +global: + # Vérifie la disponibilité d'une version plus récente de Traefik. + checkNewVersion: true + # Partage des données avec l'éditeur de Traefik. + sendAnonymousUsage: false + +log: + filePath: "/var/log/traefik/traefik.log" + format: common + level: "INFO" + maxBackups: 0 + maxSize: 100 + +ping: + # Nom du point d'entrée de ping. + entryPoint: "ping" + +providers: + docker: + endpoint: unix:///var/run/docker.sock + exposedByDefault: false + network: haiku-network + watch: true + file: + directory: "/etc/traefik/dynamic" + watch: true diff --git a/containers/conf/valkey.conf b/containers/conf/valkey.conf new file mode 100755 index 00000000..42c5546e --- /dev/null +++ b/containers/conf/valkey.conf @@ -0,0 +1,3 @@ +appendonly yes +maxmemory 1024mb +maxmemory-policy allkeys-lru diff --git a/cspell.json b/cspell.json index 368cacba..3e858631 100644 --- a/cspell.json +++ b/cspell.json @@ -1,21 +1,15 @@ { - "dictionaries": [ - "fr-fr", - "en-gb" - ], - "words": [ - "GLITCHTIP", - "Vali", - "fdir", - "mobily", - "oxlint", - "valibot", - "zstandard", - "Eles", - "logtape" - ], + "dictionaries": ["fr-fr", "en-gb"], + "words": ["GLITCHTIP", "Vali", "fdir", "mobily", "oxlint", "valibot", "zstandard", "Eles", "logtape"], "userWords": [ "lightningcss", - "haikuatelier" + "haikuatelier", + "healthcheck", + "traefik", + "innodb", + "jaegertracing", + "eilandert", + "valkey", + "somaxconn" ] -} \ No newline at end of file +} diff --git a/justfile b/justfile index 63dc812a..578fe7d8 100755 --- a/justfile +++ b/justfile @@ -144,5 +144,27 @@ reload-tab: set -f REQUEST '{ "id": 2, "method": "Page.reload", "params": { "ignoreCache": true, "scriptToEvaluateOnLoad": "" } }' echo $REQUEST | websocat $WSURL +# Créé l'image OCI. +[group('container')] build-wordpress-container: @podman build -t wordpress-haiku-atelier:latest --progress=plain --file "containers/Dockerfile" . + +# Lance les services. +[group('container')] +up-services: + @podman compose up -d + +# Arrête les services. +[group('container')] +down-services: + @podman compose down + +# Redémarre les services. +[group('container')] +restart-services: + @podman compose restart + +# Met à jour les conteneurs images des conteneurs. +[group('container')] +pull-images: + bun "scripts/pull-container-images.ts" diff --git a/package.json b/package.json index 03e5f142..21334069 100755 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@sentry/browser": "^10.22.0", "a11y-dialog": "^8.1.4", "chalk": "^5.6.2", + "effect": "^3.19.0", "lit-html": "^3.3.1", "loglevel": "^1.9.2", "loglevel-plugin-prefix": "^0.8.4", @@ -25,7 +26,7 @@ "devDependencies": { "@biomejs/biome": "^2.3.3", "@cspell/dict-fr-fr": "^2.3.2", - "@eslint/js": "^9.39.0", + "@eslint/js": "^9.39.1", "@playwright/test": "^1.56.1", "@prettier/plugin-php": "^0.24.0", "@prettier/plugin-xml": "^3.4.2", @@ -37,7 +38,7 @@ "better-typescript-lib": "^2.12.0", "browserslist": "^4.27.0", "caniuse-lite": "^1.0.30001753", - "eslint": "^9.39.0", + "eslint": "^9.39.1", "eslint-plugin-oxlint": "^1.25.0", "eslint-plugin-perfectionist": "^4.15.1", "fdir": "^6.5.0", @@ -58,7 +59,7 @@ "stylelint-declaration-block-no-ignored-properties": "^2.8.0", "stylelint-plugin-logical-css": "^1.2.3", "typescript": "5.9.3", - "typescript-eslint": "^8.46.2", + "typescript-eslint": "^8.46.3", "vite": "^7.1.12", "vite-plugin-compression2": "^2.3.1", "vite-plugin-manifest-sri": "^0.2.0", diff --git a/scripts/pull-container-images.ts b/scripts/pull-container-images.ts new file mode 100644 index 00000000..da11a9f6 --- /dev/null +++ b/scripts/pull-container-images.ts @@ -0,0 +1,42 @@ +import { BunFile, YAML } from "bun"; +import { Array, Console, Effect, Option, pipe, Record, Schema } from "effect"; +import { type UnknownException } from "effect/Cause"; +import { type ParseError } from "effect/ParseResult"; +import { type ReadonlyRecord } from "effect/Record"; + +const COMPOSE_PATH = "compose.yaml"; + +const getServicesKey = ( + yaml: ReadonlyRecord, +): Option.Option> => + pipe( + Record.get("services")(yaml), + Option.andThen(yaml => Record.keys(yaml)), + ); + +const getComposeYaml = ( + filePath: string, + schema: Schema.Schema, +): Effect.Effect => + pipe( + Effect.try(() => Bun.file(filePath)), + Effect.andThen((file: BunFile) => Effect.tryPromise(() => file.text())), + Effect.andThen((text: string) => Effect.try(() => YAML.parse(text))), + Effect.andThen((yaml: unknown) => Schema.decodeUnknown(schema)(yaml)), + ); + +const programEffect: Effect.Effect> = Effect.gen(function*() { + return yield* pipe( + // Récupère le contenu du fichier compose.yaml sous forme de Record. + getComposeYaml(COMPOSE_PATH, Schema.Record({ key: Schema.String, value: Schema.Unknown })), + // Récupère la clé des services. + Effect.andThen((yaml: ReadonlyRecord) => getServicesKey(yaml)), + // Retire la clé de l'image WordPress. + Effect.andThen((keys: ReadonlyArray) => Array.filter(keys, key => key !== "wordpress")), + Effect.orElseSucceed(() => [""]), + // Exécute la commande podman. + Effect.tap(services => Bun.spawn({ cmd: ["podman", "compose", "pull", ...services], timeout: 10000 })), + ); +}); + +Effect.runFork(programEffect).pipe(Effect.tapErrorCause(Console.error)); diff --git a/web/app/themes/haiku-atelier-2024/views/a-propos.twig b/web/app/themes/haiku-atelier-2024/views/a-propos.twig index 36b4d6cd..36b18a30 100755 --- a/web/app/themes/haiku-atelier-2024/views/a-propos.twig +++ b/web/app/themes/haiku-atelier-2024/views/a-propos.twig @@ -20,6 +20,7 @@ @@ -34,6 +35,7 @@ @@ -48,6 +50,7 @@ @@ -62,6 +65,7 @@ @@ -76,6 +80,7 @@ @@ -90,6 +95,7 @@ @@ -107,6 +113,7 @@ An icon in form of a cross @@ -131,6 +138,7 @@ An icon in form of a cross @@ -157,6 +165,7 @@ An icon in form of a cross @@ -184,6 +193,7 @@ An icon in form of a cross @@ -210,6 +220,7 @@ An icon in form of a cross @@ -240,6 +251,7 @@ An icon in form of a cross diff --git a/web/app/themes/haiku-atelier-2024/views/accueil.twig b/web/app/themes/haiku-atelier-2024/views/accueil.twig index 391ab7f2..b9a8c105 100755 --- a/web/app/themes/haiku-atelier-2024/views/accueil.twig +++ b/web/app/themes/haiku-atelier-2024/views/accueil.twig @@ -15,6 +15,7 @@ {# Animation #}
-
+
{{ produit.photo_repos }} diff --git a/web/app/themes/haiku-atelier-2024/views/parts/pages/produit/photos-produit.twig b/web/app/themes/haiku-atelier-2024/views/parts/pages/produit/photos-produit.twig index e61543f2..83376eb9 100755 --- a/web/app/themes/haiku-atelier-2024/views/parts/pages/produit/photos-produit.twig +++ b/web/app/themes/haiku-atelier-2024/views/parts/pages/produit/photos-produit.twig @@ -4,7 +4,10 @@ class="colonne colonne-gauche" > {% for photo in produit.photos_colonne_gauche %} -
+
{{ photo }} @@ -17,7 +20,10 @@ class="colonne colonne-droite" > {% for photo in produit.photos_colonne_droite %} -
+
{{ photo }} diff --git a/web/app/themes/haiku-atelier-2024/views/parts/pages/shop/grille-produits.twig b/web/app/themes/haiku-atelier-2024/views/parts/pages/shop/grille-produits.twig index ac13d38b..3e9e6a88 100755 --- a/web/app/themes/haiku-atelier-2024/views/parts/pages/shop/grille-produits.twig +++ b/web/app/themes/haiku-atelier-2024/views/parts/pages/shop/grille-produits.twig @@ -7,7 +7,7 @@ {% for produit in produits %} {# TODO: Trouver une meilleure arborescence et des noms de classe #}