Merge branch 'master' into stable

Author: gau1991

.travis.yml

@@ -14,6 +14,7 @@ before_install:
   - rm -rf ~/.gnupg
 
 before_script:
+  - sudo rm -rf /etc/mysql/
   - sudo bash -c 'echo example.com > /etc/hostname'
   - sudo service hostname restart
   - sudo apt-get -qq purge mysql* graphviz*
@@ -22,7 +23,7 @@ before_script:
 
 script:
   - unset LANG
-  - sudo echo -e "[user]\n\tname = abc\n\temail = [email protected]" > ~/.gitconfig
+  - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = [email protected]" > /home/travis/.gitconfig'
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
   - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt
   - sudo bash install $TRAVIS_BRANCH
@@ -117,3 +118,4 @@ script:
   - sudo ee stack install --mail
   - sudo ls /var/www/
   - sudo wp --allow-root --info
+  - sudo bash -c 'cat /var/log/ee/ee.log'

CHANGELOG.txt

@@ -1,3 +1,11 @@
+v 3.1.2 - April 29, 2015
+- Updated PHP version from PHP 5.5 to PHP 5.6 #425
+- Added ee stack upgrade command for stack upgrade #458
+- Added support for Proxy site creation #389
+- Added extra parameters such as User, Password and EMail during site creation #453
+- Fixed timezone related warnings and errors #451
+
+
 v 3.1.1 - April 21, 2015
 - Feature: update all site at once #491
 - Tweaked import-slow-log command #322

config/bash_completion.d/ee_auto.rc

@@ -35,7 +35,7 @@ _ee_complete()
 
             "stack")
                 COMPREPLY=( $(compgen \
-                              -W "install purge reload remove restart start status stop migrate" \
+                              -W "upgrade install purge reload remove restart start status stop migrate" \
                               -- $cur) )
                 ;;
 
@@ -74,7 +74,12 @@ _ee_complete()
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
             "install" | "purge" | "remove" )
                 COMPREPLY=( $(compgen \
-                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot --all --mailscanner --hhvm" \
+                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
+                              -- $cur) )
+                ;;
+            "upgrade" )
+                COMPREPLY=( $(compgen \
+                              -W "--web --mail --nginx --php --mysql --postfix --all --hhvm --php56 --no-prompt" \
                               -- $cur) )
                 ;;
             "start" | "stop" | "reload" | "restart" | "status")
@@ -160,7 +165,7 @@ _ee_complete()
 
             "create")
                 COMPREPLY=( $(compgen \
-                                    -W "--html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed" \
+                                    -W "--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --proxy= --pagespeed" \
                                  -- $cur) )
                 ;;
 
@@ -211,7 +216,13 @@ _ee_complete()
     case "$prev" in
         "--wp" | "--wpsubdir" | "--wpsubdomain")
             if [ ${COMP_WORDS[1]} != "debug" ]; then
-                retlist="--w3tc --wpfc --wpsc"
+                if [ ${COMP_WORDS[2]} == "create" ]; then
+                    retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --user --email --pass"
+                elif [ ${COMP_WORDS[2]} == "update" ]; then
+                    retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --pagespeed=off --hhvm=off"
+                else
+                    retlist=""
+                fi
             else
                 retlist="--wp=off --rewrite --rewrite=off -i --interactive"
             fi
@@ -222,6 +233,21 @@ _ee_complete()
                               -- $cur) )
             ;;
 
+        "--pagespeed" | "--hhvm")
+            if [ ${COMP_WORDS[2]} == "create" ]; then
+                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
+            elif [ ${COMP_WORDS[2]} == "update" ]; then
+                retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
+            else
+                retlist=""
+            fi
+
+            ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
+            ;;
+
         "--web" | "--admin" | "--mail" | "--nginx" | "--php" | "--mysql" | "--postfix" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcache" | "--dovecot")
             if [[ ${COMP_WORDS[2]} == "install" || ${COMP_WORDS[2]} == "purge" || ${COMP_WORDS[2]} == "remove" ]]; then
                 retlist="--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot"
@@ -310,6 +336,17 @@ _ee_complete()
         *)
             ;;
         esac
+        case "$mprev" in
+            "--user" | "--email" | "--pass")
+                if [ ${COMP_WORDS[2]} == "create" ]; then
+                    retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
+                fi
+                ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
+                ;;
+        esac
 
     return 0
 

ee/cli/plugins/debug.py

@@ -180,6 +180,17 @@ def debug_php(self):
                                           ";zend_extension",
                                           "zend_extension")
 
+                # Fix slow log is not enabled default in PHP5.6
+                config = configparser.ConfigParser()
+                config.read('/etc/php5/fpm/pool.d/debug.conf')
+                config['debug']['slowlog'] = '/var/log/php5/slow.log'
+                config['debug']['request_slowlog_timeout'] = '10s'
+                with open('/etc/php5/fpm/pool.d/debug.conf',
+                          encoding='utf-8', mode='w') as confifile:
+                    Log.debug(self, "Writting debug.conf configuration into "
+                              "/etc/php5/fpm/pool.d/debug.conf")
+                    config.write(confifile)
+
                 self.trigger_php = True
                 self.trigger_nginx = True
             else:
@@ -505,7 +516,7 @@ def default(self):
                                             "'ee debug --import-slow-log'"):
                     if not cron_time == 0:
                         Log.info(self, "setting up crontab entry,"
-                                 " please wait ...")
+                                 " please wait...")
                         EEShellExec.cmd_exec(self, "/bin/bash -c \"crontab -l "
                                              "2> /dev/null | {{ cat; echo -e"
                                              " \\\"#EasyEngine start MySQL "
@@ -518,7 +529,7 @@ def default(self):
                 else:
                     if not cron_time == 0:
                         Log.info(self, "updating crontab entry,"
-                                 " please wait ...")
+                                 " please wait...")
                         if not EEShellExec.cmd_exec(self, "/bin/bash -c "
                                                     "\"crontab "
                                                     "-l | sed '/EasyEngine "
@@ -533,7 +544,7 @@ def default(self):
                             Log.error(self, "failed to update crontab entry")
                     else:
                         Log.info(self, "removing crontab entry,"
-                                 " please wait ...")
+                                 " please wait...")
                         if not EEShellExec.cmd_exec(self, "/bin/bash -c "
                                                     "\"crontab "
                                                     "-l | sed '/EasyEngine "