Commit aa72b970 authored by Julien Fastré's avatar Julien Fastré

adding doc bundle to default repo

parent aca10ade
Master branch
=============
- Adding chill doc store bundle to basic repo
......@@ -25,6 +25,9 @@ class AppKernel extends Kernel
new Chill\ActivityBundle\ChillActivityBundle(),
new Chill\TaskBundle\ChillTaskBundle(),
new Knp\Bundle\MenuBundle\KnpMenuBundle(),
new Chill\DocStoreBundle\ChillDocStoreBundle(),
new ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle(),
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle()
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
......
......@@ -99,3 +99,56 @@ swiftmailer:
chill_custom_fields:
show_empty_values_in_views: false
champs_libres_async_uploader:
persistence_checker: 'chill_doc_store.persistence_checker'
openstack:
os_username: '%env(OS_USERNAME)%' # Required
os_password: '%env(OS_PASSWORD)%' # Required
os_tenant_id: '%env(OS_TENANT_ID)%' # Required
os_region_name: '%env(OS_REGION_NAME)%' # Required
os_auth_url: '%env(OS_AUTH_URL)%' # Required
temp_url:
temp_url_key: '%env(ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required
container: '%env(ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' #Required
temp_url_base_path: '%env(ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required. Do not forget a trailing slash
max_post_file_size: 15000000 # 15Mo, exprimés en bytes
max_expires_delay: 180
max_submit_delay: 3600
old_sound_rabbit_mq:
connections:
default:
host: '%env(RABBITMQ_HOST)%'
port: '%env(RABBITMQ_PORT)%'
user: '%env(RABBITMQ_USER)%'
password: '%env(RABBITMQ_PASSWORD)%'
vhost: '%env(RABBITMQ_VHOST)%'
lazy: false
connection_timeout: 3
read_write_timeout: 3
# requires php-amqplib v2.4.1+ and PHP5.4+
keepalive: false
# requires php-amqplib v2.4.1+
heartbeat: 0
#requires php_sockets.dll
# default false
use_socket: false
producers:
async_uploader:
connection: default
exchange_options: { name: 'async_upload', type: 'x-delayed-message', arguments: { 'x-delayed-type': [ 'S', 'direct' ] } }
queue_options: { name: 'async_uploader' }
enable_logger: true
consumers:
async_uploader:
connection: default
exchange_options: { name: 'async_upload', type: 'x-delayed-message', arguments: { 'x-delayed-type': [ 'S', 'direct' ] } }
queue_options: {name: 'async_uploader'}
callback: async_uploader.signature_checker
graceful_max_execution:
timeout: 600
exit_code: 0
\ No newline at end of file
......@@ -11,11 +11,11 @@ parameters:
mailer_host: smtp
mailer_user: ~
mailer_password: ~
mailer_port: 25
mailer_port: 1025
notification_host: localhost:8001
redis_host: 'redis'
redis_port: 6379
twilio_sid: ~
twilio_secret: ~
\ No newline at end of file
twilio_secret: ~
......@@ -21,11 +21,29 @@ services:
- "GELF_PORT=12201"
- "PHP_FPM_USER=${PHP_FPM_USER:-1000}"
- "PHP_FPM_GROUP=${PHP_FPM_GROUP:-1000}"
# rabbitmq, deps for async upload
- "RABBITMQ_HOST=rabbitmq"
- "RABBITMQ_PORT=5672"
- "RABBITMQ_USER=guest"
- "RABBITMQ_PASSWORD=guest"
- "RABBITMQ_VHOST=/"
# openstack credentials, for async upload
- "OS_USERNAME=${OS_USERNAME}"
- "OS_PASSWORD=${OS_PASSWORD}"
- "OS_REGION_NAME=${OS_REGION_NAME}"
- "OS_AUTH_URL=${OS_AUTH_URL}"
- "OS_TENANT_ID=${OS_TENANT_ID}"
# configuration for async upload
- "ASYNC_UPLOAD_TEMP_URL_BASE_PATH=${ASYNC_UPLOAD_TEMP_URL_BASE_PATH}"
- "ASYNC_UPLOAD_TEMP_URL_CONTAINER=${ASYNC_UPLOAD_TEMP_URL_CONTAINER}"
- "ASYNC_UPLOAD_TEMP_URL_KEY=${ASYNC_UPLOAD_TEMP_URL_KEY}"
links:
- db
- redis
- smtp
- logstash
- rabbitmq
nginx:
build:
context: .
......@@ -41,8 +59,6 @@ services:
- "8001:80"
db:
image: postgres:9.6
ports:
- "5445:5432"
volumes:
- ./docker/db/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
redis:
......@@ -63,9 +79,16 @@ services:
- "8002:80"
volumes:
- ./.pgadmin4:/var/lib/pgadmin
rabbitmq:
build:
context: ./docker/message-queue
ports:
- "8004:15672"
# fake smtp server
smtp:
image: schickling/mailcatcher
ports:
- "1080:1080"
- "8005:1080"
FROM rabbitmq:3-management
ENV DELAYED_MESSAGE_PATH=https://dl.bintray.com/rabbitmq/community-plugins/3.7.x/rabbitmq_delayed_message_exchange/rabbitmq_delayed_message_exchange-20171201-3.7.x.zip
ENV DELAYED_MESSAGE_VERSION=20171201-3.7.x
ENV RABBITMQ_PLUGIN_DIR=/usr/lib/rabbitmq/lib/rabbitmq_server-$RABBITMQ_VERSION/plugins
ENV DELAYED_MESSAGE_TARGET=$RABBITMQ_PLUGIN_DIR/rabbitmq_delayed_message_exchange-$DELAYED_MESSAGE_VERSION.ez
RUN apt update \
&& apt install -y --no-install-recommends wget ca-certificates unzip \
&& cd /tmp && wget $DELAYED_MESSAGE_PATH \
&& unzip rabbitmq_delayed_message_exchange-20171201-3.7.x.zip \
&& mkdir -p $RABBITMQ_PLUGIN_DIR && mv *.ez $DELAYED_MESSAGE_TARGET
RUN rabbitmq-plugins list \
&& rabbitmq-plugins enable --offline rabbitmq_delayed_message_exchange \
&& apt remove -y wget ca-certificates \
&& rm -rf /var/lib/apt/lists/* \
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment