Compare commits

...

4 Commits

Author SHA1 Message Date
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
f7f87766e3 include env files in skeleton
All checks were successful
continuous-integration/drone/tag Build is passing
2022-07-11 22:03:15 +02:00
10 changed files with 657 additions and 827 deletions

70
.env Normal file
View File

@@ -0,0 +1,70 @@
##
## Manually dump .env files in .env.local.php with
## `$ composer symfony:dump-env prod`
##
## Project environment
# this should be set in docker-compose.yml file
# APP_ENV=prod
## Enable debug
APP_DEBUG=false
## Locale
LOCALE=fr
## Framework secret
APP_SECRET=ThisTokenIsNotSoSecretChangeIt
## Wopi server for editing documents online
WOPI_SERVER=http://collabora:9980
# must be manually set in .env.local
# ADMIN_PASSWORD=
## Symfony/framework-bundle
TRUSTED_HOSTS='^(localhost|127.0.0.1|test.localde)$'
TRUSTED_PROXIES=~
## Doctrine/doctrine-bundle
DATABASE_URL=
## Symfony/swiftmailer
## Mailer
###> symfony/mailer ###
# MAILER_DSN=smtp://localhost
MAILER_DSN=
###< symfony/mailer ###
## Notifications
NOTIFICATION_HOST=localhost:8001
NOTIFICATION_FROM_EMAIL=admin@chill.social
NOTIFICATION_FROM_NAME="Chill <admin@chill.social>"
## Pgadmin credential
PGADMIN_DEFAULT_EMAIL=
PGADMIN_DEFAULT_PASSWORD=
## OVH OpenStack Storage Container
ASYNC_UPLOAD_TEMP_URL_KEY=
ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
ASYNC_UPLOAD_TEMP_URL_CONTAINER=
## Redis Cache
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
## Twilio
TWILIO_SID=~
TWILIO_SECRET=~
DEFAULT_CARRIER_CODE=BE
## DOCKER IMAGES REGISTRY
#IMAGE_PHP=
#IMAGE_NGINX=
## DOCKER IMAGES TAG
#VERSION=test
#VERSION=prod

13
.env.dev Normal file
View File

@@ -0,0 +1,13 @@
###> symfony/mailer ###
# MAILER_DSN=smtp://localhost
MAILER_DSN=smtp://smtp:1025
###< symfony/mailer ###
DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
MAILER_URL=smtp://smtp:1025
## Pgadmin credential
PGADMIN_DEFAULT_EMAIL=admin@chill.social
PGADMIN_DEFAULT_PASSWORD=password

4
.env.prod Normal file
View File

@@ -0,0 +1,4 @@
## Gelf
GELF_HOST=gelf
GELF_PORT=12201

4
.env.test Normal file
View File

@@ -0,0 +1,4 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
ADMIN_PASSWORD=password

3
.gitignore vendored
View File

@@ -8,8 +8,7 @@ bin/*
config/secrets/ config/secrets/
## env files ## env files
.env* .env.local
!.env.dist
.composer/* .composer/*
composer.phar composer.phar

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#69704e52116be5f85a090e70d4a3068308e12b25",
"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

@@ -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: