Commit f65c8e85 authored by Boris Schauer's avatar Boris Schauer

Merge branch...

Merge branch 'task/use-secure-web-package-and-separate-folder-for-project-extensions' into 'develop'

Move project extensions to seperate folder and use private / public way

See merge request !383
parents b0fe2bad babcddd5
Pipeline #5646 passed with stages
in 11 minutes and 23 seconds
......@@ -14,10 +14,10 @@ hooks:
post-start:
- exec: sudo apt-get update
- exec: sudo apt-get install php7.0-ldap -y
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
- exec: cp ../private/typo3conf/AdditionalConfiguration.ddev.php ../private/typo3conf/AdditionalConfiguration.php
- 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
- exec: npm --prefix ../private/typo3conf/ext/t3olayout/Build install
- exec: npm --prefix ../private/typo3conf/ext/t3olayout/Build run-script build
- exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
......
# Created by .ignore support plugin (hsz.mobi)
.idea
typo3_src
bin/*
!bin/scripts/
vendor
html/fileadmin
html/typo3temp
html/uploads
html/typo3
html/index.php
html/.htaccess
html/typo3conf/ext/*
html/typo3conf/AdditionalConfiguration.php
html/typo3conf/deprecation_*
html/typo3conf/ENABLE_INSTALL_TOOL
html/typo3conf/PackageStates.php
!html/typo3conf/ext/ter*
data/etc/solr/server/solr/mycores/t3o/data
html
private/fileadmin
private/typo3
private/index.php
private/typo3temp
private/uploads
private/typo3conf/ext/
private/typo3conf/PackageStates.php
private/typo3conf/AdditionalConfiguration.php
private/typo3conf/*.log
private/typo3conf/l10n/
......@@ -71,7 +71,7 @@ layout:
stage: layout
image: node:latest
before_script:
- cd html/typo3conf/ext/t3olayout/Build
- cd private/typo3conf/ext/t3olayout/Build
script:
- npm install
- npm run build
......
......@@ -12,6 +12,10 @@
"issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
"repositories": [
{
"type": "path",
"url": "extensions/*"
},
{
"type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
......@@ -24,12 +28,16 @@
"require": {
"php": ">=7.0",
"typo3/cms-core": "^8.7",
"t3o/ter-layout": "@dev",
"t3o/ter-soap": "@dev",
"t3o/ter-frontend": "@dev",
"helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "^2.2",
"apache-solr-for-typo3/solr": "^7.0",
"t3o/t3olayout": "^3.0",
"nikic/php-parser": "^3.1",
"gordalina/cachetool": "^3.2"
"gordalina/cachetool": "^3.2",
"helhum/typo3-secure-web": "^0.2.7"
},
"require-dev": {
"nimut/testing-framework": "^2.0"
......@@ -43,19 +51,9 @@
"extra": {
"typo3/cms": {
"web-dir": "html",
"cms-package-dir": "{$vendor-dir}/typo3/cms"
"root-dir": "private"
}
},
"autoload": {
"psr-4": {
"T3o\\Ter\\": "html/typo3conf/ext/ter/Classes",
"T3o\\TerFe2\\": "html/typo3conf/ext/ter_fe2/Classes"
},
"classmap": [
"html/typo3conf/ext/ter_fe2/Classes/",
"html/typo3conf/ext/ter/"
]
},
"scripts": {
"test:unit": [
"./vendor/bin/phpunit -c .gitlab-ci/Tests/UnitTests.xml"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
#!/bin/bash -e
echo "Installing the package ..."
RELEASE_FOLDER = /path/to/web/root/
# Use the typo3console to delete some caches (permission problems)
# If version.txt is there, we assume the system is healthy
if [ -e $RELEASE_FOLDER/web/version.txt ]; then
$RELEASE_FOLDER/vendor/bin/typo3cms cache:flush
fi
# Manually delete the rest of the files
rm -rf $RELEASE_FOLDER/*
# Add Lock-File
mkdir -p ${RELEASE_FOLDER}
touch ${RELEASE_FOLDER}/INSTALLING.lock
function cleanup {
if [ -f ${RELEASE_FOLDER}/INSTALLING.lock ]; then
echo "Cleanup folder $RELEASE_FOLDER"
rm -rf -- "$RELEASE_FOLDER"
mkdir -p $RELEASE_FOLDER/web/
touch $RELEASE_FOLDER/web/index.html
echo '<h1>System not available</h1>' > $RELEASE_FOLDER/web/index.html
fi
}
trap cleanup EXIT
echo "Copying files ..."
cp -Rf files/. $RELEASE_FOLDER
echo "Adapting configuration ..."
sed -i "s/###DB_NAME###/$DB_NAME/" $RELEASE_FOLDER/web/typo3conf/LocalConfiguration.php
sed -i "s/###DB_HOST###/$DB_HOST/" $RELEASE_FOLDER/web/typo3conf/LocalConfiguration.php
sed -i "s/###DB_USER###/$DB_USER/" $RELEASE_FOLDER/web/typo3conf/LocalConfiguration.php
sed -i "s/###DB_PASS###/$DB_PASS/" $RELEASE_FOLDER/web/typo3conf/LocalConfiguration.php
# Make the typo3console executable
chmod +x $RELEASE_FOLDER/vendor/bin/typo3cms
echo "Deploying database ..."
mysql -u${DB_USER} -p${DB_PASS} ${DB_NAME} < database/dump.sql
#$RELEASE_FOLDER/vendor/bin/typo3cms database:import < database/dump.sql
# Activate required packages
echo "Activate packages ..."
$RELEASE_FOLDER/vendor/bin/typo3cms install:generatepackagestates 0 1
echo "Updating database schema ..."
$RELEASE_FOLDER/vendor/bin/typo3cms database:updateschema '*.*'
echo "Setting site name ..."
$RELEASE_FOLDER/vendor/bin/typo3cms configuration:set SYS/sitename 'ter-typo3-org-devbox'
echo "Flushing TYPO3 cache ..."
$RELEASE_FOLDER/vendor/bin/typo3cms cache:flush
# Remove Lock-File
rm ${RELEASE_FOLDER}/INSTALLING.lock
echo "----- DONE ------"
{
"name": "t3o/ter-soap",
"type": "typo3-cms-extension",
"description": "This extension provides extension listing and detail view, plus management of extension keys",
"keywords": [
"TYPO3 CMS",
"TER",
"Extensions"
],
"authors": [
{
"name": "t3o team",
"email": "maintenance@typo3.org"
}
],
"support": {
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/ter/issues"
},
"license": "GPL-2.0+",
"require": {
"typo3/cms-core": ">= 8.7.0, <= 8.7.99"
},
"autoload": {
"psr-4": {
"T3o\\Ter\\": "Classes/"
},
"classmap": [
"Classes",
"pi1",
"class.tx_ter_api.php",
"class.tx_ter_helper.php",
"class.tx_ter_tcaLabel.php"
]
},
"replace": {
"ter": "self.version"
}
}
This diff is collapsed.