Compare commits

..

5 Commits

Author SHA1 Message Date
ba33c507e6 update deps for deploy
All checks were successful
continuous-integration/drone/tag Build is passing
2022-10-10 14:29:08 +02:00
a54f1d1a06 Allow to show scopes when needed, by default 2022-10-10 14:28:34 +02:00
631bcff2d4 deploy new version
All checks were successful
continuous-integration/drone/tag Build is passing
2022-10-10 14:09:15 +02:00
c1f3a3540f Fixed: the logout path was not relevant for default security bundle 2022-10-10 14:08:43 +02:00
1307ae914d Migrate postgresql and improve skeleton 2022-10-10 12:42:22 +02:00
7 changed files with 566 additions and 826 deletions

2
.env
View File

@@ -23,7 +23,7 @@ WOPI_SERVER=http://collabora:9980
# ADMIN_PASSWORD= # ADMIN_PASSWORD=
## Symfony/framework-bundle ## Symfony/framework-bundle
TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$',${TRUSTED_HOST_2},${TRUSTED_HOST_3} TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$'
TRUSTED_PROXIES=~ TRUSTED_PROXIES=~
## Doctrine/doctrine-bundle ## Doctrine/doctrine-bundle

View File

@@ -15,7 +15,7 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "dev-master#5f6c11bde9ac1006c5b187c29f4c33ce0a44021b", "chill-project/chill-bundles": "dev-master#863a384a8521de7a4ea8fa37d17ee4ae8b7f5138",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5", "symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",

1376
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,7 @@ chill_main:
twilio_secret: '%env(resolve:TWILIO_SECRET)%' twilio_secret: '%env(resolve:TWILIO_SECRET)%'
default_carrier_code: '%env(resolve:DEFAULT_CARRIER_CODE)%' default_carrier_code: '%env(resolve:DEFAULT_CARRIER_CODE)%'
acl: acl:
form_show_scopes: false form_show_scopes: true
form_show_centers: false form_show_centers: false
access_global_history: false access_global_history: false
access_user_change_password: true access_user_change_password: true

View File

@@ -38,7 +38,7 @@ security:
#csrf_provider: security.csrf.token_manager #csrf_provider: security.csrf.token_manager
logout_on_user_change: true logout_on_user_change: true
logout: logout:
path: /saml/logout path: /logout
# uncomment to enable impersonate mode in Chill # uncomment to enable impersonate mode in Chill
# https://symfony.com/doc/current/security/impersonating_user.html # https://symfony.com/doc/current/security/impersonating_user.html

View File

@@ -18,6 +18,8 @@ services:
- PHP_FPM_USER=1000 - PHP_FPM_USER=1000
- PHP_FPM_GROUP=100 - PHP_FPM_GROUP=100
- COMPOSER_HOME=/var/www/app/.composer - COMPOSER_HOME=/var/www/app/.composer
# this is required to run tests with database from vendor/chill-project/chill-bundles directory
- DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
links: links:
- smtp - smtp
@@ -26,9 +28,11 @@ services:
- .:/var/www/app - .:/var/www/app
db: db:
image: postgis/postgis:12-3.1-alpine
volumes: volumes:
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
# if you prefer to store the data somewhere into your user path, instead of the docker's path
# this is useful not to loose data when you run `docker container prune` or `docker volume prune`
- /path/to/your/db/data:/var/lib/postgresql
ports: ports:
- "127.0.0.1:5432:5432" - "127.0.0.1:5432:5432"
environment: environment:

View File

@@ -34,7 +34,7 @@ services:
ports: ports:
- "8001:80" - "8001:80"
db: db:
image: postgis/postgis:12-3.1-alpine image: postgis/postgis:14-3.3-alpine
volumes: volumes:
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
ports: ports: