Merge branch 'release/3.0.0'

# Conflicts:
#	README.md
#	docker/httpd/conf/vhost.conf

Author: mblaschke

.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+[*.yml]
+indent_size = 2
+
+[*.conf]
+indent_size = 2

Makefile

@@ -1,40 +1,36 @@
+ARGS = $(filter-out $@,$(MAKECMDGOALS))
+
 all: deploy
 
 #############################
 # Create new project
 #############################
 
-create-cms-project:
-	bash bin/create-project.sh cms
-
-create-neos-project:
-	bash bin/create-project.sh neos
-
-create-symfony-project:
-	bash bin/create-project.sh symfony
+create:
+	bash bin/create-project.sh $(ARGS)
 
 #############################
 # MySQL
 #############################
 
 mysql-backup:
-	docker-compose run --rm --no-deps main bash /docker/bin/backup.sh mysql
+	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
 
 mysql-restore:
-	docker-compose run --rm --no-deps main bash /docker/bin/restore.sh mysql
+	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
 
 #############################
 # Solr
 #############################
 
 solr-backup:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main bash /docker/bin/backup.sh solr
+	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
 	docker-compose start solr
 
 solr-restore:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main bash /docker/bin/restore.sh solr
+	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
 	docker-compose start solr
 
 #############################
@@ -53,9 +49,18 @@ clean:
 bash:
 	docker-compose run --rm main bash
 
+root:
+	docker-compose run --rm main root
+
 #############################
 # TYPO3
 #############################
 
 scheduler:
-	docker-compose run --rm main typo3/cli_dispatch.phpsh scheduler
+	docker-compose run --rm main typo3/cli_dispatch.phpsh scheduler $(ARGS)
+
+#############################
+# Argument fix workaround
+#############################
+%:
+	@:

README.md

@@ -9,7 +9,7 @@ Supports:
 - Nginx or Apache HTTPd
 - PHP-FPM (with Xdebug and Xhprof)
 - MySQL, MariaDB or PerconaDB
-- Solr
+- Solr (disabled, without EXT:solr configuration)
 - Elasticsearch (disabled, without configuration)
 - Redis (disabled)
 - Memcached (disabled)
@@ -71,22 +71,23 @@ Logs (eg. for debugging)
     # or only php
     $ docker-compose logs main
 
-    # or only php and nginx
-    $ docker-compose logs main nginx
+    # or only php and webserver
+    $ docker-compose logs main web
 
 
-## Create new project
+## Create project
 
 First create and run the Docker containers using [docker-compose](https://github.com/docker/compose):
 
     $ docker-compose up -d
 
 Now create the project:
 
-- [Create new TYPO3 project](README-TYPO3.md)
-- [Create new NEOS project](README-NEOS.md)
-- [Create new Symfony project](README-SYMFONY.md)
-- [Running any other php based project](README-OTHER.md)
+- [Create new TYPO3 project](doc/README-TYPO3.md)
+- [Create new NEOS project](doc/README-NEOS.md)
+- [Create new Symfony project](doc/README-SYMFONY.md)
+- [Running any other php based project](doc/README-OTHER.md)
+- [Running existing project](doc/README-EXISTING.md)
 
 For an existing project just put your files into `code/` folder or use git to clone your project into `code/`.
 
@@ -99,22 +100,24 @@ Container                 | Description
 ------------------------- | -------------------------------
 main                      | Main container with PHP-FPM and tools (your entrypoint for bash, php and other stuff)
 storage                   | Storage container, eg. for Solr data
-nginx                     | Nginx webserver
-httpd (optional)          | Apache HTTPD webserver
+web                       | Apache HTTPD or Nginx webserver
 mysql                     | MySQL database
 solr                      | Apache Solr server
 elasticsearch (optional)  | Elasticsearch server
 memcached (optional)      | Memcached server
 redis (optional)          | Redis server
 
-This directory will be mounted under `/docker` in `main`, `nginx` and `httpd` container.
+This directory will be mounted under `/docker` in `main` and `web` container.
 
 ### Makefile
 
 Customize the [Makefile](Makefile) for your needs.
 
 Command                   | Description
 ------------------------- | -------------------------------
+make bash                 | Enter main container with bash (user www-data)
+make root                 | Enter main container with bash (user root)
+<br>                      |
 make backup               | General backup (run all backup tasks)
 make restore              | General restore (run all restore tasks)
 <br>                      |
@@ -187,6 +190,7 @@ TYPO3_CONTEXT         | Context for TYPO3, can be used for TypoScript conditions
 FLOW_CONTEXT          | Context for FLOW and NEOS
 <br>                  |
 MAIL_GATEWAY          | Upstream server for sending mails (ssmtp)
+DNS_DOMAIN            | List of wildcard domains pointing to webserver (eg. for local content fetching)
 <br>                  |
 MYSQL_ROOT_PASSWORD   | Password for MySQL user "root"
 MYSQL_USER            | Initial created MySQL user

bin/.config.sh

@@ -17,7 +17,10 @@ if [ "$unamestr" == 'FreeBSD' -o "$unamestr" == 'Darwin'  ]; then
 fi
 
 if [ -z "`which $READLINK`" ]; then
-    echo '$READLINK not installed'
+    echo "[ERROR] $READLINK not installed"
+    echo "        make sure coreutils are installed"
+    echo "        MacOS: brew install coreutils"
+    exit 1
 fi
 
 SCRIPT_DIR=$(dirname $($READLINK -f "$0"))
@@ -33,7 +36,11 @@ BACKUP_MYSQL_FILE='mysql.sql.bz2'
 #######################################
 
 errorMsg() {
-    echo "[ERR] $*"
+    echo "[ERROR] $*"
+}
+
+logMsg() {
+    echo " * $*"
 }
 
 sectionHeader() {

bin/backup.sh

@@ -19,15 +19,25 @@ case "$1" in
     ## MySQL
     ###################################
     "mysql")
-        rm -f -- "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
-        mysqldump --opt --all-databases | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        if [ -f "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" ]; then
+            logMsg "Removing old backup file..."
+            rm -f -- "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        fi
+
+        logMsg "Starting MySQL backup..."
+        mysqldump --opt --single-transaction --all-databases | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
         ;;
 
     ###################################
     ## Solr
     ###################################
     "solr")
-        rm -f -- "${BACKUP_DIR}/${BACKUP_SOLR_FILE}"
-        tar jcf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /data/solr/
+        if [ -f "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" ]; then
+            logMsg "Removing old backup file..."
+            rm -f -- "${BACKUP_DIR}/${BACKUP_SOLR_FILE}"
+        fi
+
+        logMsg "Starting Solr backup..."
+        tar jcPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /data/solr/
         ;;
-esac
+esac

bin/create-project.sh

@@ -7,8 +7,8 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.config.sh"
 
-if [ "$#" -ne 1 ]; then
-    echo "No project type defined (either cms or neos)"
+if [ "$#" -lt 1 ]; then
+    echo "No project type defined (either cms, neos, symfony or git)"
     exit 1
 fi
 
@@ -21,7 +21,7 @@ case "$1" in
     ###################################
     ## TYPO3 CMS
     ###################################
-    "cms")
+    "typo3")
         execInDir "$CODE_DIR" "composer create-project typo3/cms-base-distribution \"$CODE_DIR\""
         execInDir "$CODE_DIR" "touch FIRST_INSTALL"
         ;;
@@ -41,6 +41,17 @@ case "$1" in
         execInDir "$CODE_DIR" "php /tmp/symfony.$$.phar new '$CODE_DIR'"
         rm -f -- /tmp/symfony.$$.phar
         ;;
+
+    ###################################
+    ## GIT
+    ###################################
+    "git")
+        if [ "$#" -lt 2 ]; then
+            echo "Missing git url"
+            exit 1
+        fi
+        git clone --recursive "$2" "$CODE_DIR"
+        ;;
 esac
 
 touch -- "$CODE_DIR/.gitkeep"

bin/restore.sh

@@ -19,14 +19,27 @@ case "$1" in
     ## MySQL
     ###################################
     "mysql")
-        bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" | mysql
+        if [ -f "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" ]; then
+            logMsg "Starting MySQL restore..."
+            bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" | mysql
+        else
+            errorMsg "MySQL backup file not found"
+            exit 1
+        fi
         ;;
 
     ###################################
     ## Solr
     ###################################
     "solr")
-        rm -rf /data/solr/* && mkdir -p /data/solr/
-        tar jxf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" -C /
+        if [ -f "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" ]; then
+            logMsg "Starting Solr restore..."
+            rm -rf /data/solr/* && mkdir -p /data/solr/
+            chmod 777 /data/solr/
+            tar jxPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" -C /
+        else
+            errorMsg "Solr backup file not found"
+            exit 1
+        fi
         ;;
-esac
+esac

doc/README-EXISTING.md

@@ -0,0 +1,25 @@
+[<-- Back to main section](../README.md)
+
+# Running any existing project
+
+## Create project
+
+Checkout your git repository
+
+    $ make create-project git https://github..../
+
+or manually
+
+    $ git clone --recursive https://github..../ code/
+
+Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `docker-env.yml`
+
+## Cli runner
+
+You can run one-shot command inside the `main` service container:
+
+    $ docker-compose run --rm main any-php-file.php argument1 argument2
+
+    $ docker-compose run --rm main bash
+
+Webserver is available at Port 8000

README-NEOS.md renamed to doc/README-NEOS.md

@@ -1,12 +1,12 @@
-[<-- Back to main section](README.md)
+[<-- Back to main section](../README.md)
 
 # Running NEOS
 
 ## Create NEOS project
 
 For the first NEOS setup (make sure [composer](https://getcomposer.org/) is installed):
 
-    $ make create-neos-project
+    $ make create-project neos
 
 or
 
@@ -26,8 +26,12 @@ most of the time there is no need to enter any Docker container.
 
 You can run one-shot command inside the `main` service container:
 
-    $ docker-compose run --rm code flow core:setfilepermissions
+    # commands with root rights
+    $ docker-compose run --rm main root ./flow core:setfilepermissions
 
-    $ docker-compose run --rm code bash
+    # normal commands
+    $ docker-compose run --rm main ./flow core:anyothercommand
 
-Webserver is available at Port 8000
+    $ docker-compose run --rm main bash
+
+Webserver is available at Port 8000

README-OTHER.md renamed to doc/README-OTHER.md

@@ -1,4 +1,4 @@
-[<-- Back to main section](README.md)
+[<-- Back to main section](../README.md)
 
 # Running any php based project
 
@@ -12,8 +12,8 @@
 
 You can run one-shot command inside the `main` service container:
 
-    $ docker-compose run --rm code any-php-file.php argument1 argument2
+    $ docker-compose run --rm main any-php-file.php argument1 argument2
 
-    $ docker-compose run --rm code bash
+    $ docker-compose run --rm main bash
 
-Webserver is available at Port 8000
+Webserver is available at Port 8000