Commit 2c8a70e0 authored by Oliver Wand's avatar Oliver Wand

Merge branch 'ddev-0.20.0' into 'develop'

Update ddev to 0.20.0, update LocalConfiguration and install ldap php module in container

See merge request !362
parents 6a4bde97 8a326e93
Pipeline #4912 passed with stages
in 6 minutes and 27 seconds
APIVersion: v0.19.0
APIVersion: v0.20.0
name: ter
type: typo3
docroot: html
......@@ -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,10 +20,10 @@ 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'.
......
......@@ -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,10 +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/";}',
......@@ -37,7 +39,7 @@ return [
'FE' => [
'debug' => true,
'loginSecurityLevel' => 'rsa',
'pageNotFound_handling' => '404'
'pageNotFound_handling' => '404',
],
'GFX' => [
'jpg_quality' => '80',
......@@ -71,7 +73,6 @@ return [
'devIPmask' => '*',
'displayErrors' => 1,
'enableDeprecationLog' => 'file',
// the encryption key will be overwritten on deployment
'encryptionKey' => '52fd0fa7b7337befc0840fd8ad8fd8868fc9d98f60ea9b6e737ce732448e80eb35d2662bc15d04eb523171ec727c1dee',
'exceptionalErrors' => 28674,
'isInitialDatabaseImportDone' => true,
......
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