Commit 7a64ac7b authored by Visay Keo's avatar Visay Keo 💬

Merge branch 'VBL-120' into 'master'

[TASK] Correct spelling of web-directory

Closes VBL-120

See merge request !11
parents 129fcd4a 6b37720e
...@@ -4,7 +4,7 @@ CHANGELOG ...@@ -4,7 +4,7 @@ CHANGELOG
3.1-dev 3.1-dev
------- -------
- - [TASK] Lower-case spelling of web-directory
3.1.2 3.1.2
----- -----
......
...@@ -131,9 +131,9 @@ to make sure everything is exactly the same as on remote. ...@@ -131,9 +131,9 @@ to make sure everything is exactly the same as on remote.
For Flow, `Data/Persistent/` will be synced while for TYPO3 these directory will be synced: For Flow, `Data/Persistent/` will be synced while for TYPO3 these directory will be synced:
- Web/fileadmin/ - web/fileadmin/
- Web/typo3conf/l10n/ - web/typo3conf/l10n/
- Web/uploads/ - web/uploads/
The file/directory with the name `.gitkeep`, `_temp_` and `_processed_` will not be synced. The file/directory with the name `.gitkeep`, `_temp_` and `_processed_` will not be synced.
......
...@@ -5,6 +5,6 @@ data_dir: ...@@ -5,6 +5,6 @@ data_dir:
flow: flow:
- Data/Persistent/ - Data/Persistent/
typo3: typo3:
- Web/fileadmin/ - web/fileadmin/
- Web/typo3conf/l10n/ - web/typo3conf/l10n/
- Web/uploads/ - web/uploads/
...@@ -35,7 +35,7 @@ if (cat ${ROOT_DIR}/composer.lock | grep "dockerflow" > /dev/null); then ...@@ -35,7 +35,7 @@ if (cat ${ROOT_DIR}/composer.lock | grep "dockerflow" > /dev/null); then
fi fi
if (cat ${ROOT_DIR}/composer.lock | grep "dockertypo3" > /dev/null); then if (cat ${ROOT_DIR}/composer.lock | grep "dockertypo3" > /dev/null); then
FRAMEWORK="typo3" FRAMEWORK="typo3"
DATA_DIR="Web/uploads" DATA_DIR="web/uploads"
# Use Development context if TYPO3 Context is not set # Use Development context if TYPO3 Context is not set
FRAMEWORK_CONTEXT=${TYPO3_CONTEXT:=Development} FRAMEWORK_CONTEXT=${TYPO3_CONTEXT:=Development}
......
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