From 92f77c2a17a40471b1318da50bf536300d8b2983 Mon Sep 17 00:00:00 2001 From: Helmut Hummel Date: Fri, 15 Jun 2018 21:56:18 +0200 Subject: [PATCH] Restructure config files, remove .env features --- .env.dist | 25 ------------------- .env.install | 21 ---------------- .gitignore | 2 +- config/dev.settings.yaml | 17 +------------ config/env.yaml | 21 ---------------- .../dev/cache.yaml} | 0 config/includes/dev/debug.yaml | 16 ++++++++++++ .../extension.yaml} | 4 +-- .../routing.yaml} | 12 ++++----- config/settings.yaml | 5 ++-- 10 files changed, 28 insertions(+), 95 deletions(-) delete mode 100644 .env.install delete mode 100644 config/env.yaml rename config/{dev.settings.cache.yaml => includes/dev/cache.yaml} (100%) create mode 100644 config/includes/dev/debug.yaml rename config/{settings.extension.yaml => includes/extension.yaml} (82%) rename config/{settings.routing.yaml => includes/routing.yaml} (69%) diff --git a/.env.dist b/.env.dist index 235285d..c24a329 100644 --- a/.env.dist +++ b/.env.dist @@ -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' diff --git a/.env.install b/.env.install deleted file mode 100644 index b87100b..0000000 --- a/.env.install +++ /dev/null @@ -1,21 +0,0 @@ -# Installation defaults -## Set these values if your distribution should provide some default values for TYPO setup process -## It is also possible to expose these as "real" env vars, e.g. for Docker setups -#TYPO3_INSTALL_DB_HOST='localhost' -#TYPO3_INSTALL_DB_PORT='3306' -#TYPO3_INSTALL_DB_UNIX_SOCKET='' -#TYPO3_INSTALL_DB_USE_EXISTING='0' -#TYPO3_INSTALL_DB_DBNAME='' - -# for testing only -#TYPO3_INSTALL_DB_USER='root' -#TYPO3_INSTALL_DB_PASSWORD='root' -#TYPO3_INSTALL_ADMIN_USER='admin' -#TYPO3_INSTALL_ADMIN_PASSWORD='password' -#TYPO3_INSTALL_SITE_NAME='Awesome TYPO3 Distribution Demo' -#TYPO3_INSTALL_SITE_SETUP_TYPE='site' - -# Custom values -## routing default host names -TYPO3_ROUTING_HOSTNAME_DEFAULT='awesome-typo3.dev' -TYPO3_ROUTING_HOSTNAME_EN='en.awesome-typo3.dev' diff --git a/.gitignore b/.gitignore index f578062..0d510a4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,4 @@ /public -/conf/host.yml +/config/local.settings.yaml diff --git a/config/dev.settings.yaml b/config/dev.settings.yaml index a2dfdf2..6aa35cb 100644 --- a/config/dev.settings.yaml +++ b/config/dev.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' } diff --git a/config/env.yaml b/config/env.yaml deleted file mode 100644 index b5e4aaa..0000000 --- a/config/env.yaml +++ /dev/null @@ -1,21 +0,0 @@ -BE: - installToolPassword: '%env(TYPO3_INSTALL_TOOL_PASSWORD)%' -DB: - Connections: - Default: - dbname: '%env(TYPO3_INSTALL_DB_DBNAME)%' - driver: 'mysqli' - host: '%env(TYPO3_INSTALL_DB_HOST)%' - password: '%env(TYPO3_INSTALL_DB_PASSWORD)%' - port: '' - unix_socket: '' - user: '%env(TYPO3_INSTALL_DB_USER)%' -GFX: - processor_path: '%env(TYPO3_GFX_PROCESSOR_PATH)%' - processor_path_lzw: '%env(TYPO3_GFX_PROCESSOR_PATH)%' -MAIL: - transport: 'sendmail' - transport_sendmail_command: '/usr/sbin/sendmail -t -i ' -SYS: - encryptionKey: '%env(TYPO3_ENCRYPTION_KEY)%' - sitename: '%env(TYPO3_INSTALL_SITE_NAME)%' diff --git a/config/dev.settings.cache.yaml b/config/includes/dev/cache.yaml similarity index 100% rename from config/dev.settings.cache.yaml rename to config/includes/dev/cache.yaml diff --git a/config/includes/dev/debug.yaml b/config/includes/dev/debug.yaml new file mode 100644 index 0000000..e741c69 --- /dev/null +++ b/config/includes/dev/debug.yaml @@ -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' } diff --git a/config/settings.extension.yaml b/config/includes/extension.yaml similarity index 82% rename from config/settings.extension.yaml rename to config/includes/extension.yaml index d0cb28b..65a444c 100644 --- a/config/settings.extension.yaml +++ b/config/includes/extension.yaml @@ -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' diff --git a/config/settings.routing.yaml b/config/includes/routing.yaml similarity index 69% rename from config/settings.routing.yaml rename to config/includes/routing.yaml index d4fc90d..3e5d3c1 100644 --- a/config/settings.routing.yaml +++ b/config/includes/routing.yaml @@ -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' diff --git a/config/settings.yaml b/config/settings.yaml index 5de9356..1e3feb5 100644 --- a/config/settings.yaml +++ b/config/settings.yaml @@ -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: