Merge pull request #60 from WordOps/updating-configuration

Updating configuration

.travis.yml

@@ -26,7 +26,7 @@ script:
   - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = root@localhost.com" > /home/travis/.gitconfig'
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
   - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt ccze tree
-  - sudo bash install -b $TRAVIS_BRANCH
+  - sudo bash install -b $TRAVIS_BRANCH --travis
   - sudo wo --help && sudo wo stack install && sudo wo stack install --admin
 
   - sudo wo site create html.net --html && sudo wo site create php.com --php && sudo wo site create mysql.com --mysql || sudo tail -n50 /var/log/wo/wordops.log

CHANGELOG.md

@@ -40,7 +40,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Increase MySQL root password size to 16 characters
 - Increase MySQL users password size to 16 characters
 - Nginx locations template is the same for php7.2 & 7.3
-- refactor install script
 - backend SSL configuration now stored in /var/www/22222/conf/nginx/ssl.conf
 
 #### Fixed
@@ -58,6 +57,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - fix command "wo info"
 - phpmyadmin install with composer
 - command "wo clean --memcached"
+- phpredisadmin setup
+- --hsts flag with basic html site
 
 ### v3.9.4 - 2019-03-15
 

README.md

@@ -130,6 +130,7 @@ wo site create example.com --proxy=127.0.0.1:3000 #  create example.com with ngi
 ```bash
 wo site create example.com --wp --letsencrypt # install wordpress & secure site with letsencrypt
 wo site create sub.example.com --wp --letsencrypt=subdomain # install wordpress and secure subdomain with letsencrypt
+wo site create site.tld --wp --letsencrypt --hsts # install wordpress & secure site with letsencrypt with HSTS
 ```
 
 ## Update WordOps

install

@@ -51,6 +51,31 @@ wo_lib_error() {
     exit "$2"
 }
 
+###
+# 1 - script argument parsing
+###
+
+while [ "$#" -gt 0 ]; do
+    case "$1" in
+    -b | --branch)
+        wo_branch="$2"
+        shift
+        ;;
+    -p | --preserve)
+        wo_preserve_config="y"
+        ;;
+    --force)
+        wo_force_install="y"
+        ;;
+    --travis)
+        wo_travis="y"
+        ;;
+    *) # positional args
+        ;;
+    esac
+    shift
+done
+
 ###
 # 1 - Check whether the installation is called with elevated rights
 ###
@@ -67,8 +92,10 @@ echo ""
 ###
 # 1- Update the apt sewers with fresh info
 ###
+[ -z "$wo_travis" ] && {
 wo_lib_echo "Updating apt-get repository info"
 apt-get update -qq
+}
 
 ###
 # 1- Check whether lsb_release is installed, and if not, install it
@@ -78,24 +105,6 @@ if [ -z "$(command -v lsb_release)" ]; then
     apt-get -y install lsb-release -qq
 fi
 
-while [ "$#" -gt 0 ]; do
-    case "$1" in
-    -b | --branch)
-        wo_branch="$2"
-        shift
-        ;;
-    -p | --preserve)
-        wo_preserve_config="y"
-        ;;
-    --force)
-        wo_force_install="y"
-        ;;
-    *) # positional args
-        ;;
-    esac
-    shift
-done
-
 ###
 # 1 - Define variables for later use
 ###
@@ -124,19 +133,19 @@ fi
 # 1 - Checking linux distro
 ###
 if [ -z "$wo_force_install" ]; then
-if [ "$wo_linux_distro" != "Ubuntu" ] && [ "$wo_linux_distro" != "Debian" ]; then
+    if [ "$wo_linux_distro" != "Ubuntu" ] && [ "$wo_linux_distro" != "Debian" ]; then
-    wo_lib_echo_fail "WordOps (wo) only supports Ubuntu and Debian at the moment."
+        wo_lib_echo_fail "WordOps (wo) only supports Ubuntu and Debian at the moment."
-    wo_lib_echo_fail "If you are feeling adventurous, you are free to fork WordOps to support"
+        wo_lib_echo_fail "If you are feeling adventurous, you are free to fork WordOps to support"
-    wo_lib_echo_fail "other Linux distributions and perhaps even Unix deratives."
+        wo_lib_echo_fail "other Linux distributions and perhaps even Unix deratives."
-    exit 100
-else
-    check_wo_linux_distro=$(lsb_release -sc | grep -E "trusty|xenial|bionic|jessie|stretch")
-    if [ -z "$check_wo_linux_distro" ]; then
-        wo_lib_echo_fail "WordOps (wo) only supports Ubuntu 14.04/16.04/18.04, Debian 8.x and Debian 9.x"
         exit 100
+    else
+        check_wo_linux_distro=$(lsb_release -sc | grep -E "trusty|xenial|bionic|jessie|stretch")
+        if [ -z "$check_wo_linux_distro" ]; then
+            wo_lib_echo_fail "WordOps (wo) only supports Ubuntu 14.04/16.04/18.04, Debian 8.x and Debian 9.x"
+            exit 100
+        fi
     fi
 fi
-fi
 
 ###
 # 1 - To prevent errors or unexpected behaviour, create the log and ACL it

wo/cli/plugins/site.py

@@ -899,6 +899,17 @@ class WOSiteUpdateController(CementBaseController):
                 Log.info(self, "\nPassword Unchanged.")
             return 0
 
+        if (pargs.hsts and not (pargs.html or
+                                pargs.php or pargs.php73 or pargs.mysql or
+                                pargs.wp or pargs.wpfc or pargs.wpsc or
+                                pargs.wpsubdir or pargs.wpsubdomain)):
+            try:
+                setupHsts(self, wo_domain)
+            except SiteError as e:
+                Log.debug(self, str(e))
+                Log.info(self, "\nFail to enable HSTS")
+            return 0
+
         if ((stype == 'php' and
              oldsitetype not in ['html', 'proxy', 'php73']) or
             (stype == 'mysql' and oldsitetype not in ['html', 'php',
@@ -908,7 +919,7 @@ class WOSiteUpdateController(CementBaseController):
             (stype == 'wpsubdir' and oldsitetype in ['wpsubdomain']) or
             (stype == 'wpsubdomain' and oldsitetype in ['wpsubdir']) or
             (stype == oldsitetype and cache == oldcachetype) and
-                not pargs.php73):
+                not pargs.php73 or pargs.hsts):
             Log.info(self, Log.FAIL + "can not update {0} {1} to {2} {3}".
                      format(oldsitetype, oldcachetype, stype, cache))
             return 1