Skip to content

Commit

Permalink
Merge for version 3.0.0 (#27)
Browse files Browse the repository at this point in the history
* Add Doxygen generation
* Feature/23 Add support for TYPO3 10 #23 (#26)
* Switch CI to Github actions #24
* Add support for TYPO3 10 #23
  • Loading branch information
thucke authored Mar 16, 2021
1 parent 7537282 commit 0e9d611
Show file tree
Hide file tree
Showing 52 changed files with 4,052 additions and 702 deletions.
180 changes: 180 additions & 0 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
name: timezones
type: typo3
docroot: .build/web
php_version: "7.3"
webserver_type: apache-fpm
dbaimage: phpmyadmin/phpmyadmin:4.9.4
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: true
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.2"
mysql_version: ""
provider: default
use_dns_when_possible: true
composer_version: "2"
hooks:
post-start:
- exec: echo '*/1 * * * * root TYPO3_CONTEXT=Development /usr/bin/php /var/www/html/public/typo3/sysext/core/bin/typo3scheduler:run'
| sudo tee -a /etc/cron.d/typo3
- exec: sudo chmod 0600 /etc/cron.d/typo3 && sudo service cron start
- exec: sudo cp ~/.ssh/sshd_config /etc/ssh && sudo service ssh start
webimage_extra_packages: [cron, ssh]
timezone: Europe/Berlin


# This config.yaml was created with ddev version v1.16.2
# webimage: drud/ddev-webserver:v1.16.2
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0
# dbaimage: phpmyadmin:5
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'.

# Key features of ddev's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.site and https://projectname.ddev.site

# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"

# You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image.
# dbaimage: <docker_image>

# mariadb_version and mysql_version
# ddev can use many versions of mariadb and mysql
# However these directives are mutually exclusive
# mariadb_version: 10.2
# mysql_version: 8.0

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.

# webserver_type: nginx-fpm # or apache-fpm

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT

# composer_version: "2"
# if composer_version:"" it will use the current ddev default composer release.
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
# It can be set to any existing specific composer version.
# After first project 'ddev start' this will not be updated until it changes

# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.site"
# and "someothername.ddev.site".

# additional_fqdns:
# - example.com
# - sub1.example.com
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to custom/upload/dir.

# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, dba, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
# database container will be unusable.

# nfs_mount_enabled: false
# Great performance improvement but requires host configuration first.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_webserver_port: "59001"
# The host port binding for the ddev-webserver can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_db_port: "59002"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# phpmyadmin_port: "8036"
# phpmyadmin_https_port: "8037"
# The PHPMyAdmin ports can be changed from the default 8036 and 8037

# mailhog_port: "8025"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026

# webimage_extra_packages: [php7.3-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here

# dbimage_extra_packages: [telnet,netcat]
# Extra Debian packages that are needed in the dbimage can be added here

# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true

# project_tld: ddev.site
# The top-level domain used for project URLs
# The default "ddev.site" allows DNS lookup via a wildcard
# If you prefer you can change this to "ddev.local" to preserve
# pre-v1.9 behavior.

# ngrok_args: --subdomain mysite --auth username:pass
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"

# disable_settings_management: false
# If true, ddev will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php
# In this case the user must provide all such settings.

# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!

# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
10 changes: 10 additions & 0 deletions .ddev/docker-compose.environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: '3.6'

services:
web:
environment:
- TYPO3_CONTEXT=Development
- typo3DatabaseHost=db
- typo3DatabaseName=t3func
- typo3DatabasePassword=root
- typo3DatabaseUsername=root
13 changes: 13 additions & 0 deletions .ddev/docker-compose.override.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: '3.6'
services:
web:
environment:
- TYPO3_CONTEXT=Development
- PHP_IDE_CONFIG=serverName=${DDEV_SITENAME}.ddev.site
ports:
- "9922:22"
#volumes:
# # add php xdebug profile path
# #- ./php-profiles/:/tmp/debug/:delegated
# # # ports:
# # # - 8899:80
2 changes: 2 additions & 0 deletions .ddev/homeadditions/.ssh/authorized_keys
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt+w7G56IxBFQYRAXtk8S0pGvamgEiTNmcJa9pRcKg4lbCVaIMIi5UB2n5xmycJ2faNU7hNjM9CpxI+4N+QnOB04c61YoWPBSNWkbbAvrRu5Cn/h2/d6X41mj4ORMmUR9203e0uydpWAUnZxwgXl2lKasqITpEt/wSvreZb/5IhirkZ0i/DqopH/gaTQ9S5aKxdLtsqzsryySfGM4eYaY4BVGVncpGCCIrBMyQ/77mw1mPB6qa8oQ8Sw7InWggYo+cxMqIYUUYUMqloD50rjB4n/4DUViBp/JXA9NIalB8yR49Vs0nTpFNerwtOGmlRWbMej0tyT3cccENTNkNEMOr pi@audiokeller
ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQBjzjK6UcOTlsu7aooIoBK73MmA/jzetiMYTTsdG4pRtVDFWksxM223MxWSsve2Btb2x4nLwXCLEUcMk41acC6Bpq5zSrfhi3nzbxkODqIhfSt3QqlO2jnTTwegH4Q+pSGoKdFoi9wEbWsSs0n/iJNL8o+b2tRRoIvbFig0i9VEpzR2IHNOz6NRT7L9b06VEovx+sPXnTCpEUm5EHBR2xg1vb3iycGzF3u8nMIADz1UrVW1jYp44iVrHKbx53PAVjm2mbMPAxvfckTUL/AkTKb2gmEKoa7csn1+vn4Nc2/X8wpMxELC2iLd54Ee2vO0agmr9/N1oL7n0qzhvg5Sf84h Thomas
5 changes: 5 additions & 0 deletions .ddev/homeadditions/.ssh/environment
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
TYPO3_CONTEXT=Development
typo3DatabaseHost=db
typo3DatabaseName=t3func
typo3DatabasePassword=root
typo3DatabaseUsername=root
7 changes: 7 additions & 0 deletions .ddev/homeadditions/.ssh/sshd_config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ChallengeResponseAuthentication no
UsePAM yes
X11Forwarding yes
PrintMotd no
PermitUserEnvironment yes
AcceptEnv LANG LC_*
Subsystem sftp /usr/lib/openssh/sftp-server
59 changes: 7 additions & 52 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,90 +5,45 @@ root = true

# Unix-style newlines with a newline ending every file
[*]
indent_style = space
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_size = 4

[.github/**/*.yml]
indent_size = 2

[{*.rst,*.rst.txt}]
indent_style = space
indent_size = 3

# MD-Files
[*.md]
indent_style = space
indent_size = 4

# CSS-Files
[*.css]
indent_style = tab
indent_size = 4

# HTML-Files
[*.html]
indent_style = tab
indent_size = 2

# TMPL-Files
[*.tmpl]
indent_style = tab
indent_size = 4

# SCSS-Files
[*.scss]
indent_style = space
indent_size = 4

# TS/JS-Files
[*.ts]
indent_style = space
indent_size = 2

# JS-Files
[*.js]
indent_style = space
indent_size = 2

# JSON-Files
[*.json]
indent_style = tab
indent_size = 4

# PHP-Files
[*.php]
indent_style = space
indent_size = 4

# YAML-Files
[{*.yaml,*.yml}]
indent_style = space
indent_size = 2

# package.json
# .travis.yml
# bower.json
[{package.json,.travis.yml,bower.json}]
indent_style = space
indent_size = 2

# TypoScript
[*.typoscript]
indent_style = space
indent_size = 2
[*.tsconfig]
indent_style = space
indent_size = 2

# XLF-Files
[*.xlf]
indent_style = tab
indent_size = 4

# SQL-Files
[*.sql]
indent_style = tab
indent_size = 2

# .htaccess
[{_.htaccess,.htaccess}]
[{_.htaccess,.htaccess,*.xml}]
indent_style = tab
indent_size = 4
47 changes: 27 additions & 20 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.gitreview export-ignore
/.travis.yml export-ignore
/.gitlab-ci.yml export-ignore
/.scrutinizer export-ignore
/.styleci.yml export-ignore
/.php_cs.dist export-ignore
/phpunit.xml export-ignore
/Tests export-ignore
# Folders
/.ddev export-ignore
/.github export-ignore
/.vscode export-ignore
/Build export-ignore
/Tests export-ignore

# Files
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yaml export-ignore

# Build
package.json export-ignore
webpack.config.js export-ignore
yarn.lock export-ignore

# Enforce checkout with linux lf consistent over all plattforms
*.editorconfig text eol=lf
*.gitattribute text eol=lf
*.gitreview text eol=lf
*.travis.yml text eol=lf
*.gitlab-ci.yml text eol=lf
*.scrutinizer text eol=lf
*.styleci.yml text eol=lf
*.xml text eol=lf
*.html text eol=lf
*.css text eol=lf
*.tmpl text eol=lf
Expand All @@ -34,5 +33,13 @@
*.sql text eol=lf
*.t3s text eol=lf
*.txt text eol=lf
*.twig text eol=lf
*.svg text eol=lf
*.typoscript text eol=lf

*.tsconfig text eol=lf
*.editorconfig text eol=lf
*.gitattribute text eol=lf
*.gitreview text eol=lf
*.travis.yml text eol=lf
*.gitlab-ci.yml text eol=lf
*.scrutinizer text eol=lf
*.styleci.yml text eol=lf
Loading

0 comments on commit 0e9d611

Please sign in to comment.