Skip to content
This repository has been archived by the owner on Jan 16, 2024. It is now read-only.

Commit

Permalink
updates after talking with Larry
Browse files Browse the repository at this point in the history
  • Loading branch information
ksjogo committed Oct 11, 2016
1 parent 0cb1cd5 commit 843e5f7
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 47 deletions.
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/app/config/parameters.yml
htdocs/*
!htdocs/typo3conf
htdocs/typo3conf/*
!htdocs/typo3conf/LocalConfiguration.php
!htdocs/typo3conf/AdditionalConfiguration.php
!/htdocs/favicon.ico
!/htdocs/typo3conf/l10n
web/*
!web/typo3conf
web/typo3conf/*
!web/typo3conf/LocalConfiguration.php
!web/typo3conf/AdditionalConfiguration.php
!/web/favicon.ico
!/web/typo3conf/l10n
/vendor/
33 changes: 19 additions & 14 deletions .platform.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build:

runtime:
extensions:
- redis
#- redis
- imagick
- xdebug

Expand All @@ -21,14 +21,15 @@ runtime:
# side is in the form `<service name>:<endpoint name>`.
relationships:
database: 'mysqldb:mysql'
redis: 'rediscache:redis'
#redis: 'rediscache:redis'

# The configuration of app when it is exposed to the web.
web:
locations:
'/':
# The public directory of the app, relative to its root.
root: 'htdocs'
# check if web convention
root: 'web'
passthru: '/index.php'
index:
- 'index.php'
Expand All @@ -42,45 +43,49 @@ web:
'^/sitemap\.xml$':
allow: true
'/uploads':
root: 'htdocs/uploads'
root: 'web/uploads'
scripts: false
allow: true
passthru: '/index.php'
'/fileadmin':
root: 'htdocs/fileadmin'
root: 'web/fileadmin'
scripts: false
allow: true
passthru: '/index.php'
'/typo3temp/assets':
root: 'htdocs/typo3temp/assets'
root: 'web/typo3temp/assets'
scripts: false
allow: true
passthru: '/index.php'
'/typo3conf/LocalConfiguration.php':
allow: false
'/typo3conf/AdditionalConfiguration.php':
allow: false

# The size of the persistent disk of the application (in MB).
disk: 2048

# The mounts that will be performed when the package is deployed.
mounts:
"/htdocs/typo3temp/assets": "shared:files/tmp-assets"
"/htdocs/typo3temp/var": "shared:files/tmp-var"
"htdocs/uploads": "shared:files/uploads"
"htdocs/fileadmin": "shared:files/fileadmin"
"htdocs/typo3conf/writeable": "shared:files/config"
"web/typo3temp/assets": "shared:files/tmp-assets"
"web/typo3temp/var": "shared:files/tmp-var"
"web/uploads": "shared:files/uploads"
"web/fileadmin": "shared:files/fileadmin"
"web/typo3conf/writeable": "shared:files/config"

# The hooks that will be performed when the package is deployed.
hooks:
build: |
vendor/bin/typo3cms install:generatepackagestates --activate-default=true
cd htdocs
cd web
touch FIRST_INSTALL
cd typo3conf
ln -s writeable/LocalConfiguration.php LocalConfiguration.php
ln -s writeable/ENABLE_INSTALL_TOOL ENABLE_INSTALL_TOOL
deploy: |
[ ! -f htdocs/typo3conf/writeable/LocalConfiguration.php ] && echo '<?php return array();' >> htdocs/typo3conf/writeable/LocalConfiguration.php
vendor/bin/typo3cms install:setup --non-interactive --admin-user-name='admin' --admin-password='password' --site-setup-type='none' --site-name='TYPO3 on Platform.sh'
[ ! -f web/typo3conf/writeable/LocalConfiguration.php ] && echo '<?php return array();' >> web/typo3conf/writeable/LocalConfiguration.php
[ ! -f web/typo3conf/writeable/installed.lock ] && vendor/bin/typo3cms install:setup --non-interactive --admin-user-name='admin' --admin-password='password' --site-setup-type='none' --site-name='TYPO3 on Platform.sh' && touch web/typo3conf/writeable/installed.lock
vendor/bin/typo3cms install:fixfolderstructure
vendor/bin/typo3cms extension:setupactive
vendor/bin/typo3cms cache:flush
Expand Down
2 changes: 1 addition & 1 deletion .platform/routes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# the first part should be your project name
upstream: "app:http"
cache:
enabled: false
enabled: true
4 changes: 2 additions & 2 deletions .platform/services.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mysqldb:
type: mysql:10.0
disk: 2048
rediscache:
type: redis:3.0
#rediscache:
# type: redis:3.0
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
.ONESHELL:
devpush:
DIRTY=0
cd htdocs/typo3conf/ext/bootstrap_package
cd web/typo3conf/ext/bootstrap_package
if git commit -a; then git push && DIRTY=1; fi
cd ../../../../vendor/helhum/typo3-console
if git commit -a; then git push && DIRTY=1; fi
cd ../../../vendor/typo3fluid/fluid
if git commit -a; then git push && DIRTY=1; fi
cd ../../../vendor/typo3/cms
if git commit -a; then git push && DIRTY=1; fi
cd ../../../htdocs/typo3conf/ext/bootstrap_package
cd ../../../web/typo3conf/ext/bootstrap_package
if git commit -a; then git push && DIRTY=1; fi
cd ../../../..
[ $$DIRTY -eq 1 ] && COMPOSER_PROCESS_TIMEOUT=2000 composer update --ignore-platform-reqs --prefer-source
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"extra": {
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": "htdocs"
"web-dir": "web"
},
"helhum/typo3-console": {
"install-binary": false,
Expand Down
85 changes: 83 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file removed htdocs/typo3conf/l10n/.gitkeep
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password'] = $endpoint['password'];
}

$redisHost = "";
$redisPort = "";
foreach ($relationships['redis'] as $endpoint) {
$redisHost = $endpoint['host'];
$redisPort = $endpoint['port'];
}
// $redisHost = "";
// $redisPort = "";
// foreach ($relationships['redis'] as $endpoint) {
// $redisHost = $endpoint['host'];
// $redisPort = $endpoint['port'];
// }

$list = [];
$counter = 3;
foreach ($list as $key) {
$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching'][$key] = [
'backend' => 'TYPO3\CMS\Core\Cache\Backend\RedisBackend',
'options' => array(
'database' => $counter++,
'hostname' => $redisHost,
'port' => $redisPort
),
];
}
// $list = [];
// $counter = 3;
// foreach ($list as $key) {
// $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching'][$key] = [
// 'backend' => 'TYPO3\CMS\Core\Cache\Backend\RedisBackend',
// 'options' => array(
// 'database' => $counter++,
// 'hostname' => $redisHost,
// 'port' => $redisPort
// ),
// ];
// }
}

0 comments on commit 843e5f7

Please sign in to comment.