X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=4b34af3023c5e4ef2c7e07571c637c4c790fb248;hb=6113dbbc2037551ac11bab2c7cd1bb6f78676e0f;hp=b0d330ab5d3c7162fe721e31de6a510ab410fddf;hpb=426bb453d295900fb3e35dce2f9081a42639cf27;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/config/config.yml b/app/config/config.yml index b0d330ab..4b34af30 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -2,6 +2,7 @@ imports: - { resource: parameters.yml } - { resource: security.yml } - { resource: services.yml } + - { resource: wallabag.yml } parameters: # Allows to use the live reload feature for changes in assets @@ -15,7 +16,7 @@ framework: fallback: "%locale%" secret: "%secret%" router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: "%kernel.project_dir%/app/config/routing.yml" strict_requirements: ~ form: ~ csrf_protection: ~ @@ -25,180 +26,14 @@ framework: engines: ['twig'] default_locale: "%locale%" trusted_hosts: ~ - trusted_proxies: ~ session: # handler_id set to null will use default session handler from php.ini handler_id: session.handler.native_file - save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" + save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%" fragments: ~ http_method_override: true assets: ~ -wallabag_core: - version: 2.2.3 - paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" - languages: - en: 'English' - fr: 'Français' - de: 'Deutsch' - tr: 'Türkçe' - fa: 'فارسی' - ro: 'Română' - pl: 'Polish' - da: 'Dansk' - es: 'Español' - oc: 'Occitan' - it: 'Italiano' - pt: 'Português' - items_on_page: 12 - theme: material - language: '%locale%' - rss_limit: 50 - reading_speed: 1 - cache_lifetime: 10 - action_mark_as_read: 1 - list_mode: 0 - fetching_error_message_title: 'No title found' - fetching_error_message: | - wallabag can't retrieve contents for this article. Please troubleshoot this issue. - api_limit_mass_actions: 10 - default_internal_settings: - - - name: share_public - value: 1 - section: entry - - - name: carrot - value: 1 - section: entry - - - name: share_diaspora - value: 1 - section: entry - - - name: diaspora_url - value: http://diasporapod.com - section: entry - - - name: share_unmark - value: 1 - section: entry - - - name: unmark_url - value: https://unmark.it - section: entry - - - name: share_shaarli - value: 1 - section: entry - - - name: share_scuttle - value: 1 - section: entry - - - name: shaarli_url - value: http://myshaarli.com - section: entry - - - name: scuttle_url - value: http://scuttle.org - section: entry - - - name: share_mail - value: 1 - section: entry - - - name: share_twitter - value: 1 - section: entry - - - name: show_printlink - value: 1 - section: entry - - - name: restricted_access - value: 0 - section: entry - - - name: export_epub - value: 1 - section: export - - - name: export_mobi - value: 1 - section: export - - - name: export_pdf - value: 1 - section: export - - - name: export_csv - value: 1 - section: export - - - name: export_json - value: 1 - section: export - - - name: export_txt - value: 1 - section: export - - - name: export_xml - value: 1 - section: export - - - name: import_with_redis - value: 0 - section: import - - - name: import_with_rabbitmq - value: 0 - section: import - - - name: piwik_enabled - value: 0 - section: analytics - - - name: piwik_host - value: v2.wallabag.org - section: analytics - - - name: piwik_site_id - value: 1 - section: analytics - - - name: demo_mode_enabled - value: 0 - section: misc - - - name: demo_mode_username - value: wallabag - section: misc - - - name: download_images_enabled - value: 0 - section: misc - - - name: wallabag_support_url - value: https://www.wallabag.org/pages/support.html - section: misc - - - name: wallabag_url - value: http://v2.wallabag.org - section: misc - - - name: api_user_registration - value: 0 - section: api - -wallabag_user: - registration_enabled: "%fosuser_registration%" - -wallabag_import: - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] - resource_dir: "%kernel.root_dir%/../web/uploads/import" - # Twig Configuration twig: debug: "%kernel.debug%" @@ -219,7 +54,6 @@ doctrine: charset: "%database_charset%" path: "%database_path%" unix_socket: "%database_socket%" - server_version: 5.6 orm: auto_generate_proxy_classes: "%kernel.debug%" @@ -236,17 +70,20 @@ stof_doctrine_extensions: sluggable: true doctrine_migrations: - dir_name: "%kernel.root_dir%/DoctrineMigrations" + dir_name: "%kernel.project_dir%/app/DoctrineMigrations" namespace: Application\Migrations table_name: migration_versions name: Application Migrations # Swiftmailer Configuration swiftmailer: - transport: "%mailer_transport%" - host: "%mailer_host%" - username: "%mailer_user%" - password: "%mailer_password%" + transport: "%mailer_transport%" + username: "%mailer_user%" + password: "%mailer_password%" + host: "%mailer_host%" + port: "%mailer_port%" + encryption: "%mailer_encryption%" + auth_mode: "%mailer_auth_mode%" spool: type: memory @@ -274,7 +111,7 @@ fos_rest: epub: true mobi: true templating_formats: - html: true + html: false force_redirects: html: true failed_validation: HTTP_BAD_REQUEST @@ -514,3 +351,15 @@ fos_js_routing: - howto - fos_user_security_logout - new + +jms_serializer: + handlers: + # to be removed if we switch to (default) ISO8601 datetime instead of ATOM + # see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494 + datetime: + default_format: "Y-m-d\\TH:i:sO" # ATOM + +# see https://github.com/symfony/symfony-standard/pull/1133 +sensio_framework_extra: + router: + annotations: false