瀏覽代碼

update docker settings

Olivier Massot 5 年之前
父節點
當前提交
8f06e21801
共有 4 個文件被更改,包括 42 次插入96 次删除
  1. 1 1
      docker/mariaDb/Dockerfile
  2. 4 1
      docker/mariaDb/conf/my.cnf
  3. 35 93
      docker/typo3/conf/LocalConfiguration.php
  4. 2 1
      docker/typo3/conf/apc.ini

+ 1 - 1
docker/mariaDb/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update; \
 
 ## COMPOSER
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"; \
-    php -r "if (hash_file('sha384', 'composer-setup.php') === '$COMPOSER_HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"; \
+    #php -r "if (hash_file('sha384', 'composer-setup.php') === '$COMPOSER_HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"; \
     php composer-setup.php; \
     php -r "unlink('composer-setup.php');"; \
     mv composer.phar /usr/local/bin/composer;

+ 4 - 1
docker/mariaDb/conf/my.cnf

@@ -1,4 +1,7 @@
 [mysqld]
 sql-mode="NO_ENGINE_SUBSTITUTION"
 group_concat_max_len=100000
-max_allowed_packet=500M
+max_allowed_packet=512M
+connect_timeout=28800
+wait_timeout=28800
+interactive_timeout=28800

+ 35 - 93
docker/typo3/conf/LocalConfiguration.php

@@ -2,11 +2,17 @@
 return [
     'BE' => [
         'debug' => false,
+        'enabledBeUserIPLock' => false,
         'installToolPassword' => '$pbkdf2-sha256$25000$.PqaJ4/ltOEEgzkLb8qejA$7sU6uclI0hzXLbMNvpD7zFYeUuP9EsMZj/c5BmQXjVg',
+        'lockIP' => '0',
         'loginSecurityLevel' => 'normal',
+        'passwordHashing' => [
+            'className' => 'TYPO3\\CMS\\Core\\Crypto\\PasswordHashing\\Argon2iPasswordHash',
+            'options' => [],
+        ],
         'sessionTimeout' => '65000',
+        'showRefreshLoginPopup' => true,
         'versionNumberInFilename' => '0',
-        'lockIP' => '0',
     ],
     'DB' => [
         'Connections' => [
@@ -24,52 +30,8 @@ return [
     ],
     'EXT' => [
         'extConf' => [
-            'about' => 'a:0:{}',
             'backend' => 'a:6:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:13:"loginFootnote";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}',
-            'belog' => 'a:0:{}',
-            'beuser' => 'a:0:{}',
-            'context_help' => 'a:0:{}',
-            'css_styled_content' => 'a:0:{}',
-            'devlog' => 'a:10:{s:15:"minimumLogLevel";s:2:"-1";s:11:"excludeKeys";s:0:"";s:11:"includeKeys";s:0:"";s:8:"ipFilter";s:1:"*";s:16:"refreshFrequency";s:1:"4";s:14:"entriesPerPage";s:2:"25";s:11:"maximumRows";s:4:"1000";s:13:"optimizeTable";s:1:"1";s:20:"maximumExtraDataSize";s:7:"1000000";s:11:"logFilePath";s:0:"";}',
             'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}',
-            'feedit' => 'a:0:{}',
-            'felogin' => 'a:0:{}',
-            'fluid_styled_content' => 'a:0:{}',
-            'form' => 'a:0:{}',
-            'frontend_editing' => 'a:1:{s:11:"seoProvider";s:4:"none";}',
-            'func' => 'a:0:{}',
-            'impexp' => 'a:0:{}',
-            'info' => 'a:0:{}',
-            'info_pagetsconfig' => 'a:0:{}',
-            'linkvalidator' => 'a:0:{}',
-            'lowlevel' => 'a:0:{}',
-            'mediace' => 'a:0:{}',
-            'news' => 'a:17:{s:13:"prependAtCopy";s:1:"1";s:6:"tagPid";s:1:"1";s:12:"rteForTeaser";s:1:"0";s:22:"contentElementRelation";s:1:"1";s:21:"contentElementPreview";s:1:"1";s:13:"manualSorting";s:1:"0";s:19:"categoryRestriction";s:0:"";s:34:"categoryBeGroupTceFormsRestriction";s:1:"0";s:19:"dateTimeNotRequired";s:1:"0";s:11:"archiveDate";s:4:"date";s:12:"mediaPreview";s:5:"false";s:20:"advancedMediaPreview";s:4:"true";s:24:"showAdministrationModule";s:1:"1";s:35:"hidePageTreeForAdministrationModule";s:1:"0";s:12:"showImporter";s:1:"0";s:18:"storageUidImporter";s:1:"1";s:22:"resourceFolderImporter";s:12:"/news_import";}',
-            'opendocs' => 'a:0:{}',
-            'ot_cms' => 'a:2:{s:6:"admin.";a:4:{s:3:"url";s:34:"http://local.admin.opentalent.fr/#";s:4:"home";s:10:"/dashboard";s:6:"logout";s:7:"/logout";s:6:"switch";s:10:"/switch/%d";}s:4:"api.";a:7:{s:3:"url";s:14:"http://api/api";s:5:"login";s:12:"/login_check";s:6:"logout";s:7:"/logout";s:15:"isauthenticated";s:21:"/user/isauthenticated";s:6:"public";s:7:"/public";s:10:"parameters";s:16:"/user/parameters";s:6:"people";s:12:"/api/people/";}}',
-            'ot_migration_typo8' => 'a:0:{}',
-            'ot_portail' => 'a:0:{}',
-            'ot_webservice' => 'a:0:{}',
-            'piwik' => 'a:1:{s:20:"showFaultyConfigHelp";s:1:"1";}',
-            'piwikintegration' => 'a:7:{s:12:"emMakeHeader";s:0:"";s:19:"databaseTablePrefix";s:0:"";s:21:"enableIndependentMode";s:1:"0";s:22:"disablePiwikIdCreation";s:1:"0";s:19:"enableSchedulerTask";s:1:"0";s:22:"enableSchedulerLogging";s:1:"0";s:19:"piwikDownloadSource";s:0:"";}',
-            'realurl' => 'a:6:{s:10:"configFile";s:26:"typo3conf/realurl_conf.php";s:14:"enableAutoConf";s:1:"1";s:14:"autoConfFormat";s:1:"1";s:17:"segTitleFieldList";s:0:"";s:12:"enableDevLog";s:1:"0";s:10:"moduleIcon";s:1:"0";}',
-            'recycler' => 'a:0:{}',
-            'reports' => 'a:0:{}',
-            'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
-            'rte_ckeditor' => 'a:1:{s:15:"ckeditorVersion";s:1:"1";}',
-            'rte_ckeditor_image' => 'a:0:{}',
-            'saltedpasswords' => 'a:6:{s:20:"checkConfigurationFE";s:1:"0";s:20:"checkConfigurationBE";s:1:"0";s:3:"FE.";a:5:{s:7:"enabled";s:1:"1";s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";s:1:"0";s:15:"onlyAuthService";s:1:"0";s:12:"updatePasswd";s:1:"1";}s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";s:1:"0";s:15:"onlyAuthService";s:1:"0";s:12:"updatePasswd";s:1:"1";}s:21:"checkConfigurationFE2";s:1:"0";s:21:"checkConfigurationBE2";s:1:"0";}',
-            'scheduler' => 'a:4:{s:11:"maxLifetime";s:4:"1440";s:11:"enableBELog";s:1:"1";s:15:"showSampleTasks";s:1:"1";s:11:"useAtdaemon";s:1:"0";}',
-            'setup' => 'a:0:{}',
-            't3editor' => 'a:0:{}',
-            'taskcenter' => 'a:0:{}',
-            'theme_gallery' => 'a:0:{}',
-            'tstemplate' => 'a:0:{}',
-            'version' => 'a:0:{}',
-            'viewpage' => 'a:0:{}',
-            'wizard_crpages' => 'a:0:{}',
-            'wizard_sortpages' => 'a:0:{}',
-            'workspaces' => 'a:0:{}',
         ],
     ],
     'EXTCONF' => [
@@ -92,67 +54,52 @@ return [
             'automaticInstallation' => '1',
             'offlineMode' => '0',
         ],
-        'news' => [
-            'archiveDate' => 'date',
-            'categoryBeGroupTceFormsRestriction' => '0',
-            'categoryRestriction' => '',
-            'contentElementPreview' => '1',
-            'contentElementRelation' => '1',
-            'dateTimeNotRequired' => '0',
-            'hidePageTreeForAdministrationModule' => '0',
-            'manualSorting' => '0',
-            'mediaPreview' => 'false',
-            'prependAtCopy' => '1',
-            'resourceFolderImporter' => '/news_import',
-            'rteForTeaser' => '0',
-            'showAdministrationModule' => '1',
-            'showImporter' => '0',
-            'storageUidImporter' => '1',
-            'tagPid' => '1',
-        ],
-        'saltedpasswords' => [
-            'BE' => [
-                'forceSalted' => '0',
-                'onlyAuthService' => '0',
-                'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt',
-                'updatePasswd' => '1',
-            ],
-            'FE' => [
-                'enabled' => '1',
-                'forceSalted' => '0',
-                'onlyAuthService' => '0',
-                'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt',
-                'updatePasswd' => '1',
-            ],
-            'checkConfigurationBE' => '0',
-            'checkConfigurationBE2' => '0',
-            'checkConfigurationFE' => '0',
-            'checkConfigurationFE2' => '0',
-        ],
     ],
     'FE' => [
         'debug' => false,
         'disableNoCacheParameter' => '0',
         'pageNotFoundOnCHashError' => '0',
+        'passwordHashing' => [
+            'className' => 'TYPO3\\CMS\\Core\\Crypto\\PasswordHashing\\Argon2iPasswordHash',
+            'options' => [],
+        ],
     ],
     'GFX' => [
         'jpg_quality' => '96',
         'processor' => 'GraphicsMagick',
         'processor_allowTemporaryMasksAsPng' => false,
         'processor_colorspace' => 'RGB',
-        'processor_effects' => -1,
+        'processor_effects' => false,
         'processor_enabled' => true,
         'processor_path' => '/usr/bin/',
         'processor_path_lzw' => '/usr/bin/',
     ],
+    'HTTP' => [
+        'connect_timeout' => 120,
+    ],
     'INSTALL' => [],
+    'LOG' => [
+        'TYPO3' => [
+            'CMS' => [
+                'deprecations' => [
+                    'writerConfiguration' => [
+                        5 => [
+                            'TYPO3\CMS\Core\Log\Writer\FileWriter' => [
+                                'disabled' => true,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ],
+    ],
     'MAIL' => [
         'defaultMailFromAddress' => 'ne_pas_repondre@opentalent.fr',
-        'transport' => 'mail',
-        'transport_sendmail_command' => '',
+        'transport' => 'sendmail',
+        'transport_sendmail_command' => ' -t -i ',
         'transport_smtp_encrypt' => '',
         'transport_smtp_password' => '',
-        'transport_smtp_server' => 'mailcatcher:1025',
+        'transport_smtp_server' => '',
         'transport_smtp_username' => '',
     ],
     'SYS' => [
@@ -161,7 +108,7 @@ return [
         'caching' => [
             'cacheConfigurations' => [
                 'extbase_object' => [
-                    'backend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\ApcuBackend',
+                    'backend' => 'TYPO3\\CMS\\Core\\Cache\\Backend\\ApcBackend',
                     'frontend' => 'TYPO3\\CMS\\Core\\Cache\\Frontend\\VariableFrontend',
                     'groups' => [
                         'system',
@@ -175,16 +122,11 @@ return [
         'cookieDomain' => 'opentalent.fr',
         'devIPmask' => '',
         'displayErrors' => 0,
-        'enableDeprecationLog' => false,
-        'enable_DLOG' => true,
-        'enable_errorDLOG' => true,
-        'enable_exceptionDLOG' => true,
         'encryptionKey' => 'ed7ad07c97e4703bd18aaad78071be42',
-        'exceptionalErrors' => 20480,
+        'exceptionalErrors' => 4096,
         'fileCreateMask' => '2660',
         'folderCreateMask' => '2770',
         'sitename' => 'Opentalent',
-        'sqlDebug' => 0,
         'systemLocale' => 'fr_FR.UTF-8',
         'systemLogLevel' => 2,
     ],

+ 2 - 1
docker/typo3/conf/apc.ini

@@ -1,2 +1,3 @@
 extension=apcu.so
-extension=apc.so
+extension=apc.so
+apc.enable_cli=1