Skip to content

Commit e5dfa2f

Browse files
committed
fix default content install and xdebug
1 parent 1376d1e commit e5dfa2f

File tree

3 files changed

+12
-60
lines changed

3 files changed

+12
-60
lines changed

docker/docker-compose.override.yml.default

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
version: "2.4"
22

3+
x-service-defaults:
4+
&service-defaults
5+
restart: always
6+
networks:
7+
- front
8+
39
x-service-rewrelic:
410
&service-newrelic
511
newrelic:

scripts/makefile/xdebug.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ xdebug_status() {
1616
}
1717

1818
xdebug_find_file() {
19-
if [ -f /etc/php8/conf.d/50_xdebug.ini ]; then
20-
echo /etc/php8/conf.d/50_xdebug.ini
21-
elif [ -f /etc/php81/conf.d/50_xdebug.ini ]; then
19+
if [ -f /etc/php81/conf.d/50_xdebug.ini ]; then
2220
echo /etc/php81/conf.d/50_xdebug.ini
21+
elif [ -f /etc/php82/conf.d/50_xdebug.ini ]; then
22+
echo /etc/php82/conf.d/50_xdebug.ini
23+
elif [ -f /etc/php8/conf.d/50_xdebug.ini ]; then
24+
echo /etc/php8/conf.d/50_xdebug.ini
2325
else
24-
printf "%bXdebug ini file not found%b\n" "${RED}" "${NC}" && exit 1
26+
printf "%bXdebug ini file not found%b\n" "${RED}" "${NC}" && exit 1
2527
fi
2628
}
2729

web/modules/custom/project_default_content/content/user/4bad48eb-ff5b-45b4-b30c-ecabff09591a.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)