Skip to content
Permalink
Browse files

Restructure config files, remove .env features

  • Loading branch information...
helhum committed Jun 15, 2018
1 parent 891a647 commit 92f77c2a17a40471b1318da50bf536300d8b2983
@@ -2,28 +2,3 @@
# Use "Development" to avoid TYPO3 caching and verbose error output
# Use "Production" for maximum performance and no error output
TYPO3_CONTEXT='Development'

# Secrets
TYPO3_ENCRYPTION_KEY=''
TYPO3_INSTALL_TOOL_PASSWORD=''

# DB Credentials
TYPO3_INSTALL_DB_USER=''
TYPO3_INSTALL_DB_PASSWORD=''
TYPO3_INSTALL_DB_HOST=''
TYPO3_INSTALL_DB_PORT=''
TYPO3_INSTALL_DB_DBNAME=''
TYPO3_INSTALL_DB_DRIVER=''
TYPO3_INSTALL_DB_UNIX_SOCKET=''

## Site name
TYPO3_INSTALL_SITE_NAME=''

# Host specifics
## path to image processing binary
TYPO3_GFX_PROCESSOR_PATH=''

## routing host names
### Values are used to prompt for input if provided
TYPO3_ROUTING_HOSTNAME_DEFAULT='Domain name for default language website'
TYPO3_ROUTING_HOSTNAME_EN='Domain name for English language website'

This file was deleted.

@@ -20,4 +20,4 @@

/public

/conf/host.yml
/config/local.settings.yaml
@@ -1,30 +1,15 @@
imports:
- { resource: settings.yaml, exclude: [LOG] }
- { resource: 'dev.settings.*.yaml', type: glob }
- { resource: 'includes/dev/*.yaml', type: glob }

SYS:
displayErrors: 1
devIPmask: '*'
sqlDebug: 1
enableDeprecationLog: file
exceptionalErrors: 28930
systemLogLevel: 0
Objects:
TYPO3\CMS\Core\Configuration\ConfigurationManager:
className: 'Helhum\TYPO3\ConfigHandling\Xclass\ConfigurationManager'
TYPO3\CMS\Install\Controller\Action\Tool\AllConfiguration:
className: 'Helhum\TYPO3\ConfigHandling\Xclass\AllConfiguration'

BE:
debug: true
sessionTimeout: 31536000
FE:
debug: true
MAIL:
transport: 'mbox'
transport_mbox_file: '%env(TYPO3_PATH_COMPOSER_ROOT)%/var/log/sent-mails.log'
LOG:
writerConfiguration:
'%const(TYPO3\CMS\Core\Log\LogLevel::DEBUG)%':
TYPO3\CMS\Core\Log\Writer\FileWriter:
{ logFile: '%env(TYPO3_PATH_COMPOSER_ROOT)%/var/log/typo3-debug.log' }

This file was deleted.

File renamed without changes.
@@ -0,0 +1,16 @@
SYS:
displayErrors: 1
devIPmask: '*'
sqlDebug: 1
enableDeprecationLog: file
exceptionalErrors: 28930
systemLogLevel: 0
BE:
debug: true
FE:
debug: true
LOG:
writerConfiguration:
'%const(TYPO3\CMS\Core\Log\LogLevel::DEBUG)%':
TYPO3\CMS\Core\Log\Writer\FileWriter:
{ logFile: '%env(TYPO3_PATH_COMPOSER_ROOT)%/var/log/typo3-debug.log' }
@@ -15,13 +15,13 @@ EXT:
BE:
forceSalted: 0
onlyAuthService: 0
saltedPWHashingMethod: 'TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt'
saltedPWHashingMethod: TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt
updatePasswd: 1
FE:
enabled: 1
forceSalted: 0
onlyAuthService: 0
saltedPWHashingMethod: 'TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt'
saltedPWHashingMethod: TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt
updatePasswd: 1
scheduler:
enableBELog: '1'
@@ -2,13 +2,13 @@ EXTCONF:
realurl:
_DOMAINS:
encode:
- { GETvar: L, value: '0', useConfiguration: default.tld, urlPrepend: 'http://%env(TYPO3_ROUTING_HOSTNAME_DEFAULT)%' }
- { GETvar: L, value: '1', useConfiguration: default.tld, urlPrepend: 'http://%env(TYPO3_ROUTING_HOSTNAME_EN)%' }
- { GETvar: L, value: '0', useConfiguration: default.tld, urlPrepend: 'http://%conf(EXTCONF.helhum_site_package.defaultLanguageDomain)%' }
- { GETvar: L, value: '1', useConfiguration: default.tld, urlPrepend: 'http://%conf(EXTCONF.helhum_site_package.englishDomain)%' }
decode:
'%env(TYPO3_ROUTING_HOSTNAME_DEFAULT)%':
'%conf(EXTCONF.helhum_site_package.defaultLanguageDomain)%':
GETvars: { L: '0' }
useConfiguration: default.tld
'%env(TYPO3_ROUTING_HOSTNAME_EN)%':
'%conf(EXTCONF.helhum_site_package.englishDomain)%':
GETvars: { L: '1' }
useConfiguration: default.tld
default.tld:
@@ -30,5 +30,5 @@ EXTCONF:
dontResolveShortcuts: false
fileName:
defaultToHTMLsuffixOnPrev: false
'%env(TYPO3_ROUTING_HOSTNAME_EN)%': 'default.tld'
'%env(TYPO3_ROUTING_HOSTNAME_DEFAULT)%': 'default.tld'
'%conf(EXTCONF.helhum_site_package.englishDomain)%': 'default.tld'
'%conf(EXTCONF.helhum_site_package.defaultLanguageDomain)%': 'default.tld'
@@ -1,10 +1,9 @@
imports:
- { resource: 'DefaultConfiguration', type: typo3, exclude: [LOG] }
- { resource: 'settings.*.yaml', type: glob }
- { resource: 'includes/*.yaml', type: glob }
- { resource: '../packages/*/Configuration/Distribution/*.yaml', type: glob, ignore_errors: true }
- { resource: 'env.yaml' }
# Add or override configuration on deploy targets
- { resource: 'host.yaml', ignore_errors: true }
- { resource: 'local.settings.yaml' }

# Reasonable error handling by default
BE:

0 comments on commit 92f77c2

Please sign in to comment.
You can’t perform that action at this time.