From 9eda86e9c8a20e77c3b7a84fe9c926718e51ecc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Tue, 10 Jul 2018 17:18:55 +0200 Subject: [PATCH 1/2] Update to ddev v0.20.0 --- .ddev/config.yaml | 20 ++++++++++---------- html/typo3conf/LocalConfiguration.php | 7 +++---- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 4e1d3190..7023ee7c 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v0.19.0 +APIVersion: v0.20.0 name: ter type: typo3 docroot: html @@ -18,17 +18,17 @@ hooks: - exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php -# This config.yaml was created with ddev version v0.19.0 -# webimage: drud/nginx-php-fpm-local:v0.19.0 -# dbimage: drud/mariadb-local:v0.19.0 -# dbaimage: drud/phpmyadmin:v0.19.0 +# This config.yaml was created with ddev version v0.20.0 +# webimage: drud/nginx-php-fpm-local:v0.20.0 +# dbimage: drud/mariadb-local:v0.20.0 +# dbaimage: drud/phpmyadmin:v0.20.0 # However we do not recommend explicitly wiring these images into the # config.yaml as they may break future versions of ddev. # You can update this config.yaml using 'ddev config'. # Key features of ddev's config.yaml: -# name: # Name of the project, automatically provides +# name: # Name of the project, automatically provides # http://projectname.ddev.local and https://projectname.ddev.local # type: # drupal6/7/8, backdrop, typo3, wordpress, php @@ -37,12 +37,12 @@ hooks: # php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2" -# You can explicitly specify the webimage, dbimage, dbaimage lines but this +# You can explicitly specify the webimage, dbimage, dbaimage lines but this # is not recommended, as the images are often closely tied to ddev's' behavior, # so this can break upgrades. -# webimage: # nginx/php docker image. -# dbimage: # mariadb docker image. +# webimage: # nginx/php docker image. +# dbimage: # mariadb docker image. # dbaimage: # router_http_port: # Port to be used for http (defaults to port 80) @@ -65,4 +65,4 @@ hooks: # for them. Example: #hooks: # post-start: -# - exec: "composer install -d /var/www/html" +# - exec: "composer install -d /var/www/html" \ No newline at end of file diff --git a/html/typo3conf/LocalConfiguration.php b/html/typo3conf/LocalConfiguration.php index 3d75fc93..dd87c044 100644 --- a/html/typo3conf/LocalConfiguration.php +++ b/html/typo3conf/LocalConfiguration.php @@ -3,14 +3,12 @@ return [ 'BE' => [ 'debug' => true, 'explicitADmode' => 'explicitAllow', - // the install tool password will be overwritten on deployment 'installToolPassword' => '$P$CNFL2v68eXaD3NFqVuwQwGL2ButeOs1', 'loginSecurityLevel' => 'rsa', ], 'DB' => [ 'Connections' => [ 'Default' => [ - // the db credentials will be overwritten on deployment 'charset' => 'utf8', 'dbname' => 't3o', 'driver' => 'mysqli', @@ -23,6 +21,8 @@ return [ ], 'EXT' => [ 'extConf' => [ + 'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}', + 'gridelements' => 'a:3:{s:20:"additionalStylesheet";s:0:"";s:19:"nestingInListModule";s:1:"0";s:26:"overlayShortcutTranslation";s:1:"0";}', 'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}', 'realurl' => 'a:6:{s:10:"configFile";s:34:"typo3conf/RealurlConfiguration.php";s:14:"enableAutoConf";s:1:"1";s:14:"autoConfFormat";s:1:"0";s:17:"segTitleFieldList";s:0:"";s:12:"enableDevLog";s:1:"0";s:10:"moduleIcon";s:1:"0";}', 'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}', @@ -37,7 +37,7 @@ return [ 'FE' => [ 'debug' => true, 'loginSecurityLevel' => 'rsa', - 'pageNotFound_handling' => '404' + 'pageNotFound_handling' => '404', ], 'GFX' => [ 'jpg_quality' => '80', @@ -71,7 +71,6 @@ return [ 'devIPmask' => '*', 'displayErrors' => 1, 'enableDeprecationLog' => 'file', - // the encryption key will be overwritten on deployment 'encryptionKey' => '52fd0fa7b7337befc0840fd8ad8fd8868fc9d98f60ea9b6e737ce732448e80eb35d2662bc15d04eb523171ec727c1dee', 'exceptionalErrors' => 28674, 'isInitialDatabaseImportDone' => true, -- GitLab From 8a326e934a7de64fd0bb35fec6b05db7bd3736a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Tue, 10 Jul 2018 17:46:10 +0200 Subject: [PATCH 2/2] Add ldap php module to use FE authentication --- .ddev/config.yaml | 14 ++++++++------ html/typo3conf/LocalConfiguration.php | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 7023ee7c..098b6565 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -10,6 +10,8 @@ additional_hostnames: [] provider: default hooks: post-start: + - exec: sudo apt-get update + - exec: sudo apt-get install php7.0-ldap - exec: composer install -d /var/www/html - exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build @@ -18,7 +20,7 @@ hooks: - exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php -# This config.yaml was created with ddev version v0.20.0 +# This config.yaml was created with ddev version v0.20.0 # webimage: drud/nginx-php-fpm-local:v0.20.0 # dbimage: drud/mariadb-local:v0.20.0 # dbaimage: drud/phpmyadmin:v0.20.0 @@ -28,7 +30,7 @@ hooks: # Key features of ddev's config.yaml: -# name: # Name of the project, automatically provides +# name: # Name of the project, automatically provides # http://projectname.ddev.local and https://projectname.ddev.local # type: # drupal6/7/8, backdrop, typo3, wordpress, php @@ -37,12 +39,12 @@ hooks: # php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2" -# You can explicitly specify the webimage, dbimage, dbaimage lines but this +# You can explicitly specify the webimage, dbimage, dbaimage lines but this # is not recommended, as the images are often closely tied to ddev's' behavior, # so this can break upgrades. -# webimage: # nginx/php docker image. -# dbimage: # mariadb docker image. +# webimage: # nginx/php docker image. +# dbimage: # mariadb docker image. # dbaimage: # router_http_port: # Port to be used for http (defaults to port 80) @@ -65,4 +67,4 @@ hooks: # for them. Example: #hooks: # post-start: -# - exec: "composer install -d /var/www/html" \ No newline at end of file +# - exec: "composer install -d /var/www/html" diff --git a/html/typo3conf/LocalConfiguration.php b/html/typo3conf/LocalConfiguration.php index dd87c044..a3532b7c 100644 --- a/html/typo3conf/LocalConfiguration.php +++ b/html/typo3conf/LocalConfiguration.php @@ -21,12 +21,14 @@ return [ ], 'EXT' => [ 'extConf' => [ + 'backend' => 'a:5:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}', 'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}', 'gridelements' => 'a:3:{s:20:"additionalStylesheet";s:0:"";s:19:"nestingInListModule";s:1:"0";s:26:"overlayShortcutTranslation";s:1:"0";}', 'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}', 'realurl' => 'a:6:{s:10:"configFile";s:34:"typo3conf/RealurlConfiguration.php";s:14:"enableAutoConf";s:1:"1";s:14:"autoConfFormat";s:1:"0";s:17:"segTitleFieldList";s:0:"";s:12:"enableDevLog";s:1:"0";s:10:"moduleIcon";s:1:"0";}', 'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}', 'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}', + '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";}', 'solr' => 'a:0:{}', 't3olayout' => 'a:0:{}', 'ter' => 'a:1:{s:13:"repositoryDir";s:28:"/var/www/html/fileadmin/ter/";}', -- GitLab