Merge branch 'develop' for v1.0.0

Author: mbtamuli

.travis.yml

@@ -0,0 +1,35 @@
+sudo: required
+
+language: php
+php: 7.1
+
+env:
+  global:
+    - TEST_COMMAND=$(echo $TRAVIS_REPO_SLUG | cut -d/ -f 2) # Get command name to be tested
+
+before_script:
+  - |
+    # Remove Xdebug for a huge performance increase:
+    if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
+      phpenv config-rm xdebug.ini
+    else
+      echo "xdebug.ini does not exist"
+    fi
+  - ./ci/prepare.sh
+  - ./ci/add-test-certs.sh
+
+script:
+  - cd "$TRAVIS_BUILD_DIR/../easyengine"
+  - ./vendor/bin/behat
+
+after_script:
+  - cat /opt/easyengine/ee.log
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change

README.md

@@ -3,18 +3,18 @@
 Performs basic site functions in easyengine.
 
 `site` command contains following subcommand
- * [ee site create](#ee-site-create)
- * [ee site delete](#ee-site-delete)
- * [ee site disable](#ee-site-disable)
- * [ee site enable](#ee-site-enable)
- * [ee site info](#ee-site-info)
- * [ee site list](#ee-site-list)
- * [ee site start](#ee-site-start)
- * [ee site stop](#ee-site-stop)
- * [ee site restart](#ee-site-restart)
- * [ee site reload](#ee-site-reload)
-
-#### ee site create
+ * [create](#ee-site-create)
+ * [delete](#ee-site-delete)
+ * [disable](#ee-site-disable)
+ * [enable](#ee-site-enable)
+ * [info](#ee-site-info)
+ * [list](#ee-site-list)
+ * [start](#ee-site-start)
+ * [stop](#ee-site-stop)
+ * [restart](#ee-site-restart)
+ * [reload](#ee-site-reload)
+
+## create
 Runs the site creation.
 
 ```bash
@@ -36,36 +36,36 @@ ee site create example.com --wpredis --le       # install wordpress with page ca
 ee site create example.com --wpsubdom --le      # install wordpress wpmu-subdomain + wildcard letsencrypt ssl
 ```
 
-#### ee site delete
+## delete
 Deletes an existing EasyEngine site including the webroot and the database.
 
 ```bash
 ee site delete example.com          # Asks for confirmation.
 ee site delete example.com --yes    # Skips the confirmation prompt.
 ```
 
-#### ee site disable
+## disable
 Disables a website. It will stop all containers which will free up resources used by this site. The site's data stored in the disk will still be safe.
 
 ```bash
 ee site disable example.com
 ```
 
-#### ee site enable
+## enable
 Enables a website. It will start the docker containers of the website if they are stopped.
 
 ```bash
 ee site enable example.com
 ```
 
-#### ee site info
+## info
 Display all the relevant site information, credentials and useful links.
 
 ```bash
 ee site info example.com
 ```
 
-#### ee site list
+## list
 Lists the created websites.
 
 ```bash
@@ -75,31 +75,31 @@ ee site list --enabled                                 # List enabled sites
 ee site list --disabled                                # List disabled sites 
 ```
 
-#### ee site start
+## start
 Starts services associated with site.
 
 ```bash
 ee site start example.com		# Defaults to all services
 ee site start example.com --nginx
 ```
 
-#### ee site stop
+## stop
 Stops services associated with site.
 
 ```bash
 ee site stop example.com		# Defaults to all services
 ee site stop example.com --mailhog
 ```
 
-#### ee site restart
+## restart
 Restarts containers associated with site. This action will have a few seconds of downtime.
 
 ```bash
 ee site restart example.com		# Defaults to all services
 ee site restart example.com --nginx
 ```
 
-#### ee site reload
+## reload
 Reload services in containers without restarting container(s) associated with site.
 
 ```bash

ci/add-test-certs.sh

@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+sudo mkdir -p /opt/easyengine/nginx/certs
+
+cat <<EOF | sudo tee /opt/easyengine/nginx/certs/example2.test.crt
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIJAOfjYN/2twJzMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMMDWV4YW1wbGUyLnRlc3QwHhcNMTgwNzEzMDgyMzEwWhcNMjgwNzEwMDgyMzEw
+WjAYMRYwFAYDVQQDDA1leGFtcGxlMi50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4nSZucxge7AoPQAT9x6q9wd99/Of/5Pg9wimq9F/hI41jKT/
+Go24Cjz4+qlBk1vhT9huGfGPvtU939mkEdbtuvYX1qft2LEDK/TAUFtJCXEz/qKP
+ndFWyFhOxcKaD8lsbBW9ZuE+qK1Zjc2x4LKESmi6dAk0fgcIKxy8o1C3hFVnW8Mi
+A1bzlrTZMJl9McFaLGjtEkIBAXdk0Z9xA7Vl29AWXBkRR16WpEDhxPIR5s4qKiqv
+1I32Xaeh7R8NVIm+glMfo4C+b03/hdt6FmDvmvoKjBuFOs8156NMShIeYrzOxv18
+wJTLrJXYVjiUDylcaTZhP0a1xp3feOPweS+7gwIDAQABo1AwTjAdBgNVHQ4EFgQU
+YhlFd4zw174kiNnDQM39QS5fkk0wHwYDVR0jBBgwFoAUYhlFd4zw174kiNnDQM39
+QS5fkk0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAk3b7fwUkG1P+
+9SzU+BGXBy/VjMeCqtraZSeKKHBnqZK1AsL7osXY+/k2k5VMZNfHyOjATCpwNc06
+rhK115aHKcMpzNfaogN1xwb4/TWzC7pp9QNFJkDsIKxPBa9aYuSBlvXfKK1BOS49
+XaNC5cOdqNV5kJOU3zSqYu0P5M65rRnUQwaOvOtqknxAgsVQcfzQVfl3vFSlGMcA
+qlKifxwYo77dUp2rucY418bh2sFUIzaIFiB2cxqfOkDa70RSye5aJStvG4mxImAF
+WlZrjFDu7AwkoQSD0rkwSoOwEmrwXAAjlfGueDIq/bBLPiTptPy3zIyutT0JHV2b
+lgkJtDRf0A==
+-----END CERTIFICATE-----
+EOF
+
+cat <<EOF | sudo tee /opt/easyengine/nginx/certs/example2.test.key
+
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA4nSZucxge7AoPQAT9x6q9wd99/Of/5Pg9wimq9F/hI41jKT/
+Go24Cjz4+qlBk1vhT9huGfGPvtU939mkEdbtuvYX1qft2LEDK/TAUFtJCXEz/qKP
+ndFWyFhOxcKaD8lsbBW9ZuE+qK1Zjc2x4LKESmi6dAk0fgcIKxy8o1C3hFVnW8Mi
+A1bzlrTZMJl9McFaLGjtEkIBAXdk0Z9xA7Vl29AWXBkRR16WpEDhxPIR5s4qKiqv
+1I32Xaeh7R8NVIm+glMfo4C+b03/hdt6FmDvmvoKjBuFOs8156NMShIeYrzOxv18
+wJTLrJXYVjiUDylcaTZhP0a1xp3feOPweS+7gwIDAQABAoIBAFrDNxXj10vbx9Tj
+Ih1qukU2SIPHrnoGMCVy3zKATia3xLixLNncsUXROE1m5zSDn+ObsE1PpzhqSVld
+5seLqE7F8boEJm0yTT4h466RV82kBJ3rU7qCO9Eiq7fRjmQDbCRJ9la0sqNyjzEp
+n0Ca7DDSluCJC/PzJ4/3/ZdLc7Jis0a8Klpp2OzjXsApywSindKsC4GqLCWG/ZCA
+yncAjN8BiSoUU/cd96ckqnDTgXyx5tFZSWwVNG7hb77Y/Kes9Z4oaZNCGaLGxurI
+89WPfGeEvqN0GG+S3TjUxs+n9iZvTKa/6o3eT1TH6C1eWBQoEj9EoM8Mrx/K+zYB
+JAj6cMkCgYEA/KBCB8Oj+4XL3+21MsFUkgQKQm8FRCp29N5YxlTmcnSBgasvfHXR
+WTIEojPuABjHDyO5HKJANybFN/3pq1OgWVVg4n2ubi11HOGI5lsslXpGTuwF7fXn
+hyb07Q4Ohd/assrSB43RPKXJ1F6cbpOC/YpSQzD3Wra2Hv1m70u8dCUCgYEA5Xrd
+M7grFgSvg63072+ZnnsOhdva9QnidR7i4IWri2hWCO+pnhAwu4owJdKCj4vvlVN+
+vAJqR0TImaD/uc8m61a8slF1Ndi42lyrtWYgwMh1sBqB3uzsoDln3NjokmCLH/OC
+fLvucIBACHoaz8zpQQFiNhfEw9FnGA+Jk57tzIcCgYAT9a2B44k/RDD5flSEsBW4
+e6071n26BwjjC/ZDpU2X2XCqCBZ2ZPCndXY8QpIZW9vObGohwwgD04JdjCg8Kx1O
+MZq4CmoPtnO8Vm10lduN691GOwu042rpmMBdQnEPTsJ+wduaUTAo9IhfySHe8rS0
+x4r8WBATEMCO7kKFwZwgKQKBgG6lGeipAOVB5xp3kqSry4b1UGBMTDtfw7ey57NX
+4Al8ihcO71qN9eFG1MY3xMnPr/nw4ydlhrbMPGiOjx6Y+ev4y0yzJ++Jij+G9Sem
+kV5CiTQa48mHtOPgKer7DtAdCpeiQqU/u8y0mas8rJbK9yBnuWHZff7ohWu9ehka
+RRAbAoGAa+qjNQapv6XCNeAmunhDgMBzRZhTLZrLSvdNflenEuMpkgrkHbgJJnrG
+Yvr8i0kojvoKofYPoqvno/S5ZM2QLIVCP28HkXhVSv63doMm3pcibiAagHpNYLa9
+4uwN640uFpqt7JCSOlJP7w4zx5BKXU9D9FRwri7QivBpmBHpVLk=
+-----END RSA PRIVATE KEY-----
+EOF
+
+cat <<EOF | sudo tee /opt/easyengine/nginx/certs/www.example3.test.crt
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIJAJo9QUktB2TOMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMMDWV4YW1wbGUzLnRlc3QwHhcNMTgwNzEzMDgyMjUxWhcNMjgwNzEwMDgyMjUx
+WjAYMRYwFAYDVQQDDA1leGFtcGxlMy50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAxjI414PGPUf9aRSmjVywFHMHLhJGF1+Lg3YimM9fKo1WqD4T
+2mepdV9zOztUCGrszMNcpaltjf8nTSuNwEWUp9TQYufABavN3TvzNWnmT3Q5NIA0
+2v6SZVQUEskWwoDOqhudH8D6/Dk4m449UMKrN2VD3A61T6TtlkbiX6lX2e/8UfSH
+ECFZP/xAh68l/XgcsI46tfvBPDdQdSDYhFxIhRqWevOT2FVQjR63yL6uZ96SeiIH
+sntxjBnqaYTYwgN5Bjv1vbJwHqOMhZNnquVfxh/+EOd/gBQKBWiavC5HmjnVbjyT
+6V9GiGBMsdRfjf/pNjIaqjXMYyIEtFm2/SSaIQIDAQABo1AwTjAdBgNVHQ4EFgQU
+nrOjZu9o7IznjL5JHADGu/VLB7UwHwYDVR0jBBgwFoAUnrOjZu9o7IznjL5JHADG
+u/VLB7UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAqhW1cDx4Owrj
+EUJkyKBxT6aDtWUdSP7SAvfl4pRz3wdpTT6TWc6t0s3X81tRYSX3on4L4dzfpp2/
+/Hgz6LlBIQ9thznE7WnUDE7VR6A0+Grc4po2Vq20z52LGzff/yKWx3PSVjL0f/IL
+HZ2t5YpI36nHNcJFEJWlckPkcDa8tX5tsDFr50luCsvuZBGYu6pnLWEZumL/QdHC
+UVMAKtWZxf9Via6aIKqsUNdBwq7gHdiZFYyi8NSCX2yD06LtIjBzDTn9Qsch6hSD
+utaxR66cXq8laVwyHc+Z+HkG/Y7GytDdKGYUTPB/lIhqpMrJJDcJLJz10yR8zBub
+ZLuoQMvF5Q==
+-----END CERTIFICATE-----
+EOF
+cat <<EOF | sudo tee /opt/easyengine/nginx/certs/www.example3.test.key
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAxjI414PGPUf9aRSmjVywFHMHLhJGF1+Lg3YimM9fKo1WqD4T
+2mepdV9zOztUCGrszMNcpaltjf8nTSuNwEWUp9TQYufABavN3TvzNWnmT3Q5NIA0
+2v6SZVQUEskWwoDOqhudH8D6/Dk4m449UMKrN2VD3A61T6TtlkbiX6lX2e/8UfSH
+ECFZP/xAh68l/XgcsI46tfvBPDdQdSDYhFxIhRqWevOT2FVQjR63yL6uZ96SeiIH
+sntxjBnqaYTYwgN5Bjv1vbJwHqOMhZNnquVfxh/+EOd/gBQKBWiavC5HmjnVbjyT
+6V9GiGBMsdRfjf/pNjIaqjXMYyIEtFm2/SSaIQIDAQABAoIBABCX/dhVaRCSaW4V
+04f8XaWop848q2+jiTu9dVIT8qTOZpX5dJIRocd48V3hLrzxrtfJ94TLNafw1+qH
+HfweFz8h+zx8qMAQzVCbh1ZOgoDeezehEEvRipI/Qtr7yRMJ08O8QiB5eMoLRGkJ
+tKqBUfJ2YQMYnCeJ6HZvgt59gCR35FVzstXhAFTUPJP/kOyF/eIRGZNaBc3LZ5ah
+anWBcl+7OhcPBkYt8QCyPUFU9VxGyDe/Ei5VOasQAyfGQ92YMAPEYGH/uoND59G5
+Z7d+xvmzCEzaLFp2AsmZmvN3s3I4qUdOwSm9f2ajArUPURSybpnYoCdXvdbIWDqm
+v2jtxi0CgYEA+8ZHD07LVijalFaSc+IyOkpqs2ON3C7laljtd/tw2L5vC4gxggwC
+TkXNrJWAt/4icbc/SXjBcHF8f4Wkz7TVuKuA14XJYO2QMeFzB/wjuHam2cF6NWf0
+Z6hSEfU+ez1VaFs3tLHSMz7sRLX/3A0AKA6TKEH9UFh/6uRCCNYlyXsCgYEAyYXA
+NcHPZoWKBcKIAe4pLBDOZgkO/V5CBJ8R38TIizOJWjnzCuIyG60bq/7uVegGeWHr
+8Ajzz4rKSkmoiCXzT1s50/i7u5W9OUC9QaQYjR1FcoK543f77lZZ7RVhmHw9bACu
+iXDQQMUeTv2OJnjDghAwa2ML92vm3u76zCrEEhMCgYATqm4cfPwW88P2+DgiQxXH
+Rc7Fyk3nV+ZlgyKxT3uGAoHr9axgSw3XDU6+X0MZnAkWtsiDtaHuZX7i+w5fhvF2
+pja/Ht0W7BdqPgDdK82id+oacilYiJEnk5ctfelueOD18MIOJCGWDSEpUMn2ZzGO
+72yBJX5iyzbaow+hXxC+hwKBgEQ4fSs1oyqHxoPQqQ5OO63pOpYcNvDa+epqlzhz
+e5h0J+ldeMOUc3YfEiEVukVmuNpape6qeS8nQvgHG4CLqGSS826o45TLSjWZjvgr
+vwv2fs4XJyq0MZsrrGGwPUvLs1dem7d3c2iZ0nrXJ0oq07SyGlIgQ6rM4mlR6aE4
+UQv1AoGAPgI7RDJcqXMwG7CyIboLTyPRWsFfhN1nlALP1URK61kAkxgBusg45GEa
+k8hTB9lhcWDTbL/GVHn5JWxn8ytLPZiDR2RbJtE/Z1bagROANrFYjqJib8lyFhvt
+HYXONl5W77CPrYjOLD+Q9ZXjYYvtAxnqFNXicRMPti7Sre9SkRo=
+-----END RSA PRIVATE KEY-----
+EOF

ci/prepare.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# called by Travis CI
+
+# install dependencies
+wget -qO ee https://rt.cx/ee4beta && sudo bash ee
+rm ee
+
+# Setup EE develop repo
+cd ..
+git clone https://github.com/EasyEngine/easyengine.git easyengine --depth=1
+cd easyengine
+echo 'travis_test' > VERSION
+
+# Copy tests to EE repo
+rm -r features
+cp -R ../$TEST_COMMAND/features .
+
+# Install composer dependencies and update them for tests
+composer update
+
+# Place the command inside EE repo
+rm -r vendor/easyengine/$TEST_COMMAND
+cp -R ../$TEST_COMMAND vendor/easyengine/
+
+# Create phar and test it
+php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quite  > /dev/null
+sudo php easyengine.phar cli info