Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Gizra/drupal-starter into translata…
Browse files Browse the repository at this point in the history
…ble-paragraphs
  • Loading branch information
dipakmdhrm committed Nov 18, 2024
2 parents efddc8d + 09fd86c commit 35920bb
Show file tree
Hide file tree
Showing 19 changed files with 1,394 additions and 172 deletions.
4 changes: 2 additions & 2 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: drupal-starter
type: drupal10
docroot: web
php_version: "8.2"
php_version: "8.3"
webserver_type: nginx-fpm
router_http_port: "8880"
router_https_port: "4443"
Expand All @@ -10,7 +10,7 @@ additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.5"
version: "10.6"
fail_on_hook_fail: true
use_dns_when_possible: true
composer_version: "2"
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "~> 1.0"
language: php
dist: jammy
php:
- 8.2
- 8.3
services:
- docker
stages:
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,10 @@ when a privileged user will login, they must enable their TFA. Otherwise, on a s
login, they will already be blocked. A site admin may reset their validation tries
under the `/admin/people` page.
The TFA method that is enabled is one that uses Google authenticator (or similar).
## WAF - Crowdsec
It is recommended to use a proper WAF, either from Cloudflare, or from another vendor, but
for smaller sites, it is not always possible. [Crowdsec](https://www.crowdsec.net/) is integrated
to protect the client sites from known malicious visitors. If used in conjuction with Cloudflare or with other type of gateway that hides the originating address,
you need to make sure Drupal is aware of the real IP of the visitors.
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
],
"require": {
"php": "^8.1",
"php": "^8.3",
"ext-curl": "*",
"ext-dom": "*",
"ext-intl": "*",
Expand All @@ -38,6 +38,7 @@
"drupal/core-composer-scaffold": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10.0",
"drupal/crowdsec": "^1.1",
"drupal/default_content": "^2.0@alpha",
"drupal/emptyparagraphkiller": "^2.0",
"drupal/entity_browser": "^2.9",
Expand Down Expand Up @@ -131,9 +132,6 @@
"drupal/core-project-message": true,
"oomphinc/composer-installers-extender": true,
"mglaman/composer-drupal-lenient": true
},
"platform": {
"php": "8.1"
}
},
"extra": {
Expand Down
Loading

0 comments on commit 35920bb

Please sign in to comment.