Skip to content

Commit

Permalink
Merge pull request #35 from xima-media/release-1.1
Browse files Browse the repository at this point in the history
Release 1.1
  • Loading branch information
jackd248 authored Jan 10, 2025
2 parents 943f617 + b7f2e35 commit 79bef9b
Show file tree
Hide file tree
Showing 212 changed files with 8,814 additions and 1,803 deletions.
39 changes: 39 additions & 0 deletions .ddev/apache/10.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<VirtualHost *:80>
ServerName xima-typo3-content-planner.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]
SetEnvIf X-Forwarded-Proto "https" HTTPS=on
ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined
Alias "/phpstatus" "/var/www/phpstatus.php"
</VirtualHost>

<VirtualHost *:443>
ServerName xima-typo3-content-planner.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]
SetEnvIf X-Forwarded-Proto "https" HTTPS=on
ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined
Alias "/phpstatus" "/var/www/phpstatus.php"

SSLEngine on
SSLCertificateFile /etc/ssl/certs/master.crt
SSLCertificateKeyFile /etc/ssl/certs/master.key
</VirtualHost>
47 changes: 47 additions & 0 deletions .ddev/apache/20.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<VirtualHost *:80>
ServerName sub.xima-typo3-content-planner.ddev.site
ServerAlias *.xima-typo3-content-planner.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.xima-typo3-content-planner\.ddev\.site$
RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L]

RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]
SetEnvIf X-Forwarded-Proto "https" HTTPS=on
ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined
Alias "/phpstatus" "/var/www/phpstatus.php"
</VirtualHost>

<VirtualHost *:443>
ServerName sub.xima-typo3-content-planner.ddev.site
ServerAlias *.xima-typo3-content-planner.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.xima-typo3-content-planner\.ddev\.site$
RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L]

RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]
SetEnvIf X-Forwarded-Proto "https" HTTPS=on
ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined
Alias "/phpstatus" "/var/www/phpstatus.php"

SSLEngine on
SSLCertificateFile /etc/ssl/certs/master.crt
SSLCertificateKeyFile /etc/ssl/certs/master.key
</VirtualHost>
100 changes: 100 additions & 0 deletions .ddev/apache/apache-site.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# ddev generic/default/php config for apache2

#ddev-generated
# If you want to take over this file and customize it, remove the line above
# and ddev will respect it and won't overwrite the file.
# See https://ddev.readthedocs.io/en/stable/users/extend/customization-extendibility/#custom-apache-configuration
<VirtualHost *:80>
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]

SetEnvIf X-Forwarded-Proto "https" HTTPS=on

ServerAdmin webmaster@localhost
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test/">
AllowOverride All
Allow from All
</Directory>
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn

ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined

# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf

# Increase allowed field size for large cookies header.
LimitRequestFieldSize 16380

# Simple ddev technique to get a phpstatus
Alias "/phpstatus" "/var/www/phpstatus.php"
Alias "/xhprof" "/var/xhprof/xhprof_html"
<Directory "/var/xhprof">
Options Indexes
AllowOverride None
Require all granted
</Directory>

</VirtualHost>

<VirtualHost *:443>
SSLEngine on
SSLCertificateFile /etc/ssl/certs/master.crt
SSLCertificateKeyFile /etc/ssl/certs/master.key

# Workaround from https://mail-archives.apache.org/mod_mbox/httpd-users/201403.mbox/%3C49404A24C7FAD94BB7B45E86A9305F6214D04652@MSGEXSV21103.ent.wfb.bank.corp%3E
# See also https://gist.github.com/nurtext/b6ac07ac7d8c372bc8eb

RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last]

SetEnvIf X-Forwarded-Proto "https" HTTPS=on

ServerAdmin webmaster@localhost
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test/">
AllowOverride All
Allow from All
</Directory>
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn

ErrorLog /dev/stdout
CustomLog ${APACHE_LOG_DIR}/access.log combined

# Increase allowed field size for large cookies header.
LimitRequestFieldSize 16380

# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf
# Simple ddev technique to get a phpstatus
Alias "/phpstatus" "/var/www/phpstatus.php"
Alias "/xhprof" "/var/xhprof/xhprof_html"
<Directory "/var/xhprof">
Options Indexes
AllowOverride None
Require all granted
</Directory>

</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
30 changes: 30 additions & 0 deletions .ddev/commands/web/.install-11
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

. .ddev/commands/web/.utils.sh

VERSION=11

rm -rf /var/www/html/.test/$VERSION/*

message red "ToDo"
exit 0

intro_typo3 $VERSION
install_start $VERSION
export TYPO3_BIN="$BASE_PATH/vendor/bin/typo3cms"

composer req typo3/cms-base-distribution:'^11.5' helhum/typo3-console:'^7.1' $PACKAGE_NAME:'*@dev' \
--no-progress -n -d /var/www/html/.test/$VERSION

cd $BASE_PATH
TYPO3_INSTALL_DB_DBNAME=$DATABASE
$TYPO3_BIN install:setup -n --database-name $DATABASE
setup_typo3
$TYPO3_BIN configuration:set 'GFX/processor_path_lzw' '/usr/bin/'

sed -i "/'deprecations'/,/^[[:space:]]*'disabled' => true,/s/'disabled' => true,/'disabled' => false,/" /var/www/html/.test/$VERSION/public/typo3conf/LocalConfiguration.php

sed -i -e "s/base: ht\//base: \//g" /var/www/html/.test/$VERSION/config/sites/main/config.yaml
sed -i -e 's/base: \/en\//base: \//g' /var/www/html/.test/$VERSION/config/sites/main/config.yaml

update_typo3
25 changes: 25 additions & 0 deletions .ddev/commands/web/.install-12
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

. .ddev/commands/web/.utils.sh

VERSION=12

rm -rf /var/www/html/.test/$VERSION/*
intro_typo3 $VERSION
install_start $VERSION

composer req typo3/cms-base-distribution:'^12.4' helhum/typo3-console:'^8.1' $PACKAGE_NAME:'*@dev' test/sitepackage:'*@dev' \
--no-progress -n -d /var/www/html/.test/$VERSION

cd $BASE_PATH
TYPO3_INSTALL_DB_DBNAME=$DATABASE
$TYPO3_BIN install:setup -n --database-name $DATABASE
setup_typo3

sed -i "/'deprecations'/,/^[[:space:]]*'disabled' => true,/s/'disabled' => true,/'disabled' => false,/" /var/www/html/.test/$VERSION/config/system/settings.php

sed -i -e "s/base: ht\//base: \//g" /var/www/html/.test/$VERSION/config/sites/main/config.yaml
sed -i -e 's/base: \/en\//base: \//g' /var/www/html/.test/$VERSION/config/sites/main/config.yaml

import_data
update_typo3
23 changes: 23 additions & 0 deletions .ddev/commands/web/.install-13
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash

. .ddev/commands/web/.utils.sh

VERSION=13

rm -rf /var/www/html/.test/$VERSION/*
intro_typo3 $VERSION
install_start $VERSION

composer req typo3/cms-base-distribution:'^13.4' helhum/typo3-console:'^8.2.1' $PACKAGE_NAME:'*@dev' test/sitepackage:'*@dev' \
--no-progress -n -d /var/www/html/.test/$VERSION

cd $BASE_PATH
TYPO3_INSTALL_DB_DBNAME=$DATABASE
mysql -h db -u root -p"root" -e "CREATE DATABASE $DATABASE;"
$TYPO3_BIN setup -n --dbname=$DATABASE --password=$TYPO3_DB_PASSWORD --create-site="https://${VERSION}.xima-typo3-frontend-edit.ddev.site" --admin-user-password=$TYPO3_SETUP_ADMIN_PASSWORD
setup_typo3

sed -i "/'deprecations'/,/^[[:space:]]*'disabled' => true,/s/'disabled' => true,/'disabled' => false,/" /var/www/html/.test/$VERSION/config/system/settings.php

import_data
update_typo3
Loading

0 comments on commit 79bef9b

Please sign in to comment.