From bc181dcfea7530456038827dddc3157ea3d4d130 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 22 May 2019 17:07:56 +0200 Subject: [PATCH 1/5] PHRAS-2597 #comment removing bridge section and update section geoloc, embed-bundle , search engine, RGPD #time 3h --- lib/conf.d/configuration.yml | 96 ++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 33bd2ddb84..d898f87e83 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -1,4 +1,5 @@ servername: 'http://local.phrasea/' +Console_logger_enabled_environments: [test] languages: available: [] default: 'fr' @@ -6,7 +7,6 @@ main: maintenance: false key: '' api_require_ssl: true - delete-account-require-email-confirmation: true database: host: 'sql-host' port: 3306 @@ -24,10 +24,33 @@ main: options: {} search-engine: type: elasticsearch - # type: phrasea options: - host: localhost + host: 'localhost' port: 9200 + index: '' + shards: 3 + replicas: 0 + minScore: 2 + highlight: true + maxResultWindow: 500000 + populate_order: RECORD_ID + populate_direction: DESC + activeTab: '#elastic-search' + base_aggregate_limit: 10 + collection_aggregate_limit: 10 + doctype_aggregate_limit: 0 + camera_model_aggregate_limit: 0 + iso_aggregate_limit: 0 + aperture_aggregate_limit: 0 + shutterspeed_aggregate_limit: 0 + flashfired_aggregate_limit: 0 + framerate_aggregate_limit: 0 + audiosamplerate_aggregate_limit: 0 + videocodec_aggregate_limit: 0 + audiocodec_aggregate_limit: 0 + orientation_aggregate_limit: 0 + colorspace_aggregate_limit: 0 + mimetype_aggregate_limit: 0 task-manager: status: started enabled: true @@ -68,26 +91,20 @@ main: download: null lazaret: null caption: null - bridge: - youtube: - enabled: false - client_id: null - client_secret: null - developer_key: null - flickr: - enabled: false - client_id: null - client_secret: null - dailymotion: - enabled: false - client_id: null - client_secret: null + trusted-proxies: [] debugger: allowed-ips: [] border-manager: enabled: true - extension-mapping: { } + extension-mapping: + otc: application/vnd.oasis.opendocument.chart-template + ttc: application/x-font-ttf + xlsx: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + docx: application/msword + pptx: application/vnd.ms-powerpoint + mxf: application/mxf + mp4: video/mp4 checkers: - type: Checker\Sha256 @@ -121,6 +138,9 @@ border-manager: enabled: false options: mediatypes: [Audio, Document, Flash, Image, Video] +user_account: + deleting_policies: + email_confirmation: true authentication: auto-create: templates: { } @@ -202,8 +222,9 @@ embed_bundle: video: player: videojs autoplay: false - coverSubdef: thumbnail - available-speeds: + cover_subdef: thumbnail + message_start: StartOfMessage + available_speeds: - 1 - 1.5 - 3 @@ -211,13 +232,34 @@ embed_bundle: player: videojs autoplay: false document: - player: flexpaper + #player: flexpaper enable-pdfjs: true geocoding-providers: - name: 'mapBox' enabled: true public-key: '' + map-layers: + - + name: Light + value: 'mapbox://styles/mapbox/light-v9' + - + name: Streets + value: 'mapbox://styles/mapbox/streets-v9' + - + name: Basic + value: 'mapbox://styles/mapbox/basic-v9' + - + name: Satellite + value: 'mapbox://styles/mapbox/satellite-v9' + - + name: Dark + value: 'mapbox://styles/mapbox/dark-v9' + transition-mapboxgl: + - + animate: true + speed: '2.2' + curve: '1.42' default-position: - 2.335062 - 48.879162 @@ -233,15 +275,17 @@ geocoding-providers: # - # name: Latitude # type: lat + geonames-field-mapping: true + cityfields: 'City, Ville' + provincefields: Province + countryfields: 'Country, Pays' video-editor: vttFieldName: VideoTextTrackChapters - seekBackwardStep: 1000 # in ms - seekForwardStep: 1000 # in ms + seekBackwardStep: 500 # in ms + seekForwardStep: 500 # in ms playbackRates: - 1 - '1.5' - 3 -user_account: - deleting_policies: - email_confirmation: true + From 4812d2833314a6e03b766441dfd79e51723d656a Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 22 May 2019 23:51:42 +0200 Subject: [PATCH 2/5] PHRAS-2595 #comment set geoloc config: Assets position source is now provide by Phraseanet technical data --- lib/conf.d/configuration.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index d898f87e83..95ffd6027b 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -1,5 +1,4 @@ servername: 'http://local.phrasea/' -Console_logger_enabled_environments: [test] languages: available: [] default: 'fr' @@ -287,5 +286,5 @@ video-editor: - 1 - '1.5' - 3 - +Console_logger_enabled_environments: [test] From 04dce19fe35fe0888e2a79e5deb4108b3b7aafea Mon Sep 17 00:00:00 2001 From: nmaillat Date: Thu, 23 May 2019 14:07:50 +0200 Subject: [PATCH 3/5] PHRAS-2595 #comment geoloc remove old name property add map-provider --- lib/conf.d/configuration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 95ffd6027b..4803532646 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -235,7 +235,7 @@ embed_bundle: enable-pdfjs: true geocoding-providers: - - name: 'mapBox' + map-provider: 'mapboxWebGL' enabled: true public-key: '' map-layers: @@ -265,9 +265,9 @@ geocoding-providers: default-zoom: 2 marker-default-zoom: 11 position-fields: - - - name: GpsCompositePosition - type: latlng + #- + # name: GpsCompositePosition + # type: latlng # - # name: Longitude # type: lng From 11254a1b2cc46ecaa142ffc74dca3da84f335029 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Thu, 23 May 2019 15:10:20 +0200 Subject: [PATCH 4/5] PHRAS-2595 #comment rename enable_pdfjs --- lib/conf.d/configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 4803532646..71580cbbfe 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -232,7 +232,7 @@ embed_bundle: autoplay: false document: #player: flexpaper - enable-pdfjs: true + enable_pdfjs: true geocoding-providers: - map-provider: 'mapboxWebGL' From 7a1ba7e567e7911efbd90a56c14eda8d717698f5 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 24 May 2019 19:03:08 +0200 Subject: [PATCH 5/5] PHRAS-2597 #comment geoloc fields fix and language #time 2h debug geolocfield and test --- lib/conf.d/configuration.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 71580cbbfe..6850a7ad7e 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -1,6 +1,10 @@ servername: 'http://local.phrasea/' languages: - available: [] + available: + - fr + - en + - de + - nl default: 'fr' main: maintenance: false @@ -264,7 +268,7 @@ geocoding-providers: - 48.879162 default-zoom: 2 marker-default-zoom: 11 - position-fields: + position-fields: [] #- # name: GpsCompositePosition # type: latlng