Refactor install script

CHANGELOG.md

@@ -11,10 +11,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 #### Changed
 
 - WP-CLI updated to v2.3.0
+- Improved SSL certificates management from previous letsencrypt or certbot install
+- Use a separate python file for gitconfig during installation to redirect setup.py output into logs
 
 #### Fixed
 
 - htpasswd protection when migrating from EasyEngine v3 [Issue #152](https://github.com/WordOps/WordOps/issues/152)
+- acme.sh install when migration from EasyEngine v3 [Issue #153](https://github.com/WordOps/WordOps/issues/153)
 
 ### v3.9.8.11 - 2019-09-06
 

install

@@ -9,7 +9,7 @@
 # -------------------------------------------------------------------------
 # wget -qO wo wops.cc && sudo bash wo
 # -------------------------------------------------------------------------
-# Version 3.9.8.11 - 2019-09-07
+# Version 3.9.8.12 - 2019-09-18
 # -------------------------------------------------------------------------
 
 # CONTENTS
@@ -107,10 +107,22 @@ unset LANG
 export LANG='en_US.UTF-8'
 export LC_ALL='C.UTF-8'
 
+# check if a command exist
 command_exists() {
     command -v "$@" > /dev/null 2>&1
 }
 
+# run functions and exit on failure
+_run() {
+    if [ -n "$2" ]; then
+        wo_lib_echo "$2"
+    fi
+    if ! { "$1" >> "$wo_install_log" 2>&1; }; then
+        exit 1
+    fi
+
+}
+
 if [ -z "$wo_travis" ]; then
     if command_exists curl; then
         apt-get update -qq &
@@ -160,8 +172,10 @@ WO_ARCH="$(uname -m)"
 
 if [ -x /usr/local/bin/ee ]; then
     ee_migration=1
+    ufw="n"
 elif [ -x /usr/local/bin/wo ]; then
     wo_upgrade=1
+    ufw="n"
 fi
 if [ -z "$ufw" ]; then
     ufw="y"
@@ -189,7 +203,6 @@ fi
 ###
 if [ ! -d "$wo_log_dir" ] || [ ! -d "$wo_backup_dir" ] || [ ! -d "$wo_tmp_dir" ]; then
 
-    wo_lib_echo "Creating WordOps directory"
     mkdir -p "$wo_backup_dir" "$wo_log_dir" "$wo_tmp_dir" || wo_lib_error "Whoops - seems we are unable to create the log directory $wo_log_dir, exit status " $?
 
     # create wordops log files
@@ -203,14 +216,12 @@ fi
 ####
 
 wo_dist_upgrade() {
-    # update server packages
+    # perform server packages upgrade
     apt-get dist-upgrade --option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet
-} >> "$wo_install_log" 2>&1
+}
 
 wo_install_dep() {
 
-    {
-
     if [ "$wo_linux_distro" == "Ubuntu" ]; then
         # install dependencies
         apt-get -option=Dpkg::options::=--force-confmiss --option=Dpkg::options::=--force-confold --assume-yes install \
@@ -233,18 +244,19 @@ wo_install_dep() {
     if [ ! -f /etc/apt/apt.conf.d/20auto-upgrades ]; then
         cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades
     fi
-    } >> "$wo_install_log" 2>&1
 
 }
 
 wo_timesync() {
     # set default ntp pools
+    if [ -f /etc/systemd/timesyncd.conf ]; then
         if ! grep -q "time.cloudflare.com" /etc/systemd/timesyncd.conf; then
             sed -e 's/^#NTP=/NTP=time.cloudflare.com 0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org/' -i /etc/systemd/timesyncd.conf
             # enable ntp
             timedatectl set-ntp 1
         fi
-} >> $wo_install_log 2>&1
+    fi
+}
 
 ###
 # 3 - Create/migrate the essentials
@@ -370,7 +382,6 @@ secure_wo_db() {
 
 # Update the WP-CLI version
 wo_update_wp_cli() {
-    {
     WP_CLI_PATH=$(command -v wp)
     if [ -n "$WP_CLI_PATH" ]; then
         rm -rf "$WP_CLI_PATH"
@@ -384,18 +395,18 @@ wo_update_wp_cli() {
     [ -d /etc/bash_completion.d ] && {
         wget -qO /etc/bash_completion.d/wp-completion.bash https://raw.githubusercontent.com/wp-cli/wp-cli/master/utils/wp-completion.bash
     }
-    } >> "$wo_install_log" 2>&1
+
 }
 
 wo_install_acme_sh() {
     # check if acme.sh is already installed
-    if [ ! -x /etc/letsencrypt/acme.sh ] && [ ! -d /etc/letsencrypt/archive ]; then
+    if [ ! -x /etc/letsencrypt/acme.sh ]; then
-        {
+
         # clone the git repository
         if [ -d /opt/acme.sh/.git ]; then
             git -C /opt/acme.sh pull origin master
         else
-                git clone https://github.com/Neilpang/acme.sh.git /opt/acme.sh -q
+            git clone --depth=50 https://github.com/Neilpang/acme.sh.git /opt/acme.sh -q
         fi
         cd /opt/acme.sh || exit 1
         # create conf directories
@@ -408,10 +419,9 @@ wo_install_acme_sh() {
         # enable auto-upgrade
         /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --upgrade --auto-upgrade
 
-        } >> "$wo_install_log" 2>&1
     fi
+
     if [ -x "$HOME/.acme.sh/acme.sh" ]; then
-        {
         # backup acme.sh folder
         /bin/tar -I pigz -cf /var/lib/wo-backup/acme.sh.tar.gz "$HOME/.acme.sh"
         # rsync previous certificates to new acme.sh location
@@ -426,10 +436,11 @@ wo_install_acme_sh() {
             /etc/letsencrypt/renewal/
         # remove previous acme.sh folder
         rm -rf "$HOME/.acme.sh"
+        mkdir "$HOME/.acme.sh"
+        touch "$HOME/.acme.sh/acme.sh.env"
         # removing previous cronjob
         crontab -l | sed '/41 0 \* \* \* "\/root\/\.acme\.sh"\/acme.sh --cron --home "\/root\/\.acme\.sh" > \/dev\/null/d' | crontab -
 
-        } >> "$wo_install_log" 2>&1
     fi
     # Let's Encrypt .well-known folder setup
     if [ ! -d /var/www/html/.well-known/acme-challenge ]; then
@@ -452,7 +463,7 @@ wo_download() {
         curl -sL https://github.com/WordOps/WordOps/archive/v${wo_version}.tar.gz | tar -I pigz -xf - -C /var/lib/wo/tmp
         mv "/var/lib/wo/tmp/WordOps-$wo_version" /var/lib/wo/tmp/WordOps-install
     fi
-} >> "$wo_install_log" 2>&1
+}
 
 wo_git_config() {
 
@@ -470,7 +481,7 @@ wo_git_config() {
 wo_install() {
 
     cd /var/lib/wo/tmp/WordOps-install || exit 1
-    python3 setup.py install >> $wo_install_log 2>&1
+    python3 setup.py install
 
 }
 
@@ -479,15 +490,13 @@ wo_install_travis() {
 
     if [ -f "$HOME/.gitconfig" ]; then
         # install and redirect log to not print python package install
-        python3 setup.py install >> $wo_install_log 2>&1
+        python3 setup.py install
     fi
 
 }
 
 wo_upgrade_nginx() {
 
-    {
-
     if [ -d /var/lib/wo-backup/nginx ]; then
         /bin/tar -I pigz "$NGINX_BACKUP_FILE" /var/lib/wo-backup/nginx
         rm -rf /var/lib/wo-backup/nginx
@@ -566,9 +575,6 @@ wo_upgrade_nginx() {
     fi
     [ -f /var/lib/wo/tmp/nginx-block ] && { mv /var/lib/wo/tmp/nginx-block /etc/apt/preferences.d/nginx-block; }
 
-    } \
-        >> "$wo_install_log" 2>&1
-
 }
 
 wo_update_latest() {
@@ -603,7 +609,7 @@ wo_update_latest() {
         if [ -z "$CHECK_REDIS_BIND" ]; then
             echo 'bind 127.0.0.1 ::1' >> /etc/redis/redis.conf
 
-            service redis-server restart > /dev/null 2>&1
+            service redis-server restart
 
         fi
     fi
@@ -620,7 +626,7 @@ wo_git_init() {
         }
         git add -A .
         git commit -am "Updated Nginx"
-    } >> /var/log/wo/install.log 2>&1
+    }
     # WordOps under git version control
     [ -d /etc/wo ] && {
         cd /etc/wo || exit 1
@@ -629,7 +635,7 @@ wo_git_init() {
         }
         git add -A .
         git commit -am "Installed/Updated to WordOps"
-    } >> /var/log/wo/install.log 2>&1
+    }
     # PHP under git version control
     [ -d /etc/php ] && {
         cd /etc/php || exit 1
@@ -638,26 +644,26 @@ wo_git_init() {
         }
         git add -A .
         git commit -am "Updated PHP"
-    } >> /var/log/wo/install.log 2>&1
+    }
 }
 
 wo_backup_ee() {
     /bin/tar -I pigz -cf "$EE_BACKUP_FILE" /etc/nginx /usr/local/bin/ee /usr/lib/ee/templates /usr/local/lib/python3.*/dist-packages/ee-*.egg /etc/ee /var/lib/ee /etc/letsencrypt
-} >> $wo_install_log 2>&1
+}
 
 wo_backup_wo() {
     /bin/tar -I pigz -cf "$WO_BACKUP_FILE" /etc/nginx /etc/wo /var/lib/wo /etc/letsencrypt >> /var/log/wo/install.log 2>&1
-} >> $wo_install_log 2>&1
+}
 
 wo_clean_ee() {
     rm -f /usr/local/bin/ee /etc/bash_completion.d/ee_auto.rc /usr/lib/ee/templates /usr/local/lib/python3.*/dist-packages/ee-*.egg /etc/ee /var/lib/ee
-} >> $wo_install_log 2>&1
+}
 
 wo_remove_ee_cron() {
 
     crontab -l | sed '/ee site update --le=renew --all 2> \/dev\/null/d' | crontab -
 
-} >> $wo_install_log 2>&1
+}
 
 wo_tweak_kernel() {
 
@@ -674,19 +680,17 @@ wo_tweak_kernel() {
         # apply sysctl tweaks
         sysctl -eq -p /etc/sysctl.d/60-wo-tweaks.conf
     fi
-} >> $wo_install_log 2>&1
+}
 
 wo_systemd_tweak() {
 
     if [ ! -x /opt/wo-kernel.sh ]; then
-        {
         # download and setup wo-kernel systemd service to apply kernel tweaks for netdata and redis on server startup
         wget -qO /opt/wo-kernel.sh https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-script.mustache
         chmod +x /opt/wo-kernel.sh
         wget -qO /lib/systemd/system/wo-kernel.service https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-service.mustache
         systemctl enable wo-kernel.service
         systemctl start wo-kernel.service
-        } >> /var/log/wo/install.log 2>&1
     fi
 
     LIMIT_CHECK=$(grep "500000" /etc/security/limits.conf)
@@ -694,26 +698,23 @@ wo_systemd_tweak() {
         echo -e "*         hard    nofile      500000\n*         soft    nofile      500000\nroot      hard    nofile      500000\nroot      soft    nofile      500000\n" >> /etc/security/limits.conf
     fi
 
-} >> $wo_install_log 2>&1
+}
 
 wo_domain_suffix() {
     curl -sL https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat | sed '/^\/\//d' | sed '/^$/d' | sed 's/^\s+//g' > /var/lib/wo/public_suffix_list.dat
-} >> $wo_install_log 2>&1
+}
 
 wo_mariadb_tweak() {
     # increase mariadb open_files_limit
-    {
     if [ -d /etc/systemd/system/mariadb.service.d ] && [ ! -f /etc/systemd/system/mariadb.service.d/limits.conf ]; then
         echo -e '[Service]\nLimitNOFILE=500000' > /etc/systemd/system/mariadb.service.d/limits.conf
         systemctl daemon-reload
         service mysql restart
     fi
-    } >> /var/log/wo/install.log 2>&1
 }
 
 wo_nginx_tweak() {
     # increase nginx open_files_limit
-    {
     if [ ! -d /etc/systemd/system/nginx.service.d ]; then
         mkdir -p /etc/systemd/system/nginx.service.d
         if [ ! -f /etc/systemd/system/nginx.service.d/limits.conf ]; then
@@ -722,16 +723,15 @@ wo_nginx_tweak() {
             nginx -t && service nginx restart
         fi
     fi
-    } >> /var/log/wo/install.log 2>&1
 }
 
 wo_clean() {
     rm -rf /usr/local/lib/python3.*/dist-packages/wo-*
-} >> $wo_install_log 2>&1
+}
 
 wo_uninstall() {
     rm -rf /usr/local/lib/python3.*/dist-packages/{pystache-*,cement-2.*,wo-*} /usr/local/bin/wo /etc/bash_completion.d/wo_auto.rc /var/lib/wo /etc/wo /usr/lib/wo/templates
-} >> $wo_install_log 2>&1
+}
 
 wo_ufw_setup() {
     if ! grep -q "ENABLED=yes" /etc/ufw/ufw.conf; then
@@ -791,8 +791,7 @@ wo_ufw_setup() {
             service rsyslog restart
         fi
     fi
-} \
+}
-    >> $wo_install_log
 
 wo_cheat_install() {
     curl -sL https://cht.sh/:cht.sh > /usr/local/bin/cht.sh
@@ -801,17 +800,16 @@ wo_cheat_install() {
         ln -s /usr/local/bin/cht.sh /usr/local/bin/cheat
     }
     curl -sL https://cheat.sh/:bash_completion > /etc/bash_completion.d/cht.sh
-} >> $wo_install_log 2>&1
+}
 
 ###
 # 4 - WO MAIN SETUP
 ###
-wait
+
+# wo uninstall script
 if [ "$wo_purge" = "y" ]; then
-    wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log
+    _run wo_backup_wo "Backing-up WO install"
-    wo_backup_wo | tee -ai $wo_install_log
+    _run wo_uninstall "Uninstalling WordOps"
-    wo_lib_echo "Uninstalling WordOps" | tee -ai $wo_install_log
-    wo_uninstall | tee -ai $wo_install_log
     wo_lib_echo "The WordOps backup files can be found in $WO_BACKUP_FILE"
     exit 0
 else
@@ -822,142 +820,55 @@ else
                 wo_lib_error "You already have WordOps $wo_version_new" 1
             fi
         fi
-        wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
+        _run wo_backup_wo "Backing-up WO install"
-        wo_install_dep &
+        _run wo_clean
-        wo_timesync &
-        wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log
-        wo_backup_wo &
-        secure_wo_db &
-        wo_lib_echo "Downloading WordOps " | tee -ai $wo_install_log
-        wo_download &
-        wo_clean &
-        wait
-        wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-        if [ "$wo_travis" = "y" ]; then
-            wo_install_travis &
-        else
-            wo_git_config
-            wo_install
-        fi
-        wo_update_latest &
-        if [ ! -d /opt/acme.sh ]; then
-            wo_lib_echo "Updating acme.sh" | tee -ai $wo_install_log
-            wo_install_acme_sh &
-        fi
-        wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
-        wo_tweak_kernel &
-        if [ ! -f /opt/wo-kernel.sh ]; then
-            wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log
-            wo_systemd_tweak &
-        fi
-        if [ -x /usr/sbin/nginx ]; then
-            wo_nginx_tweak &
-        fi
-        if [ -d /etc/systemd/system/mariadb.service.d ]; then
-            wo_mariadb_tweak &
-        fi
-        wo_cheat_install &
-        wo_domain_suffix &
-        wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
-        wo_update_wp_cli &
-        wait
-    else
     # 2 - Migration from EEv3
-        if [ -x /usr/local/bin/ee ]; then
+    elif [ -x /usr/local/bin/ee ]; then
         if [ -z "$wo_force_install" ]; then
             echo -e "Migrate from EasyEngine to WordOps (y/n): " && read -r WO_ANSWER
             if [ "$WO_ANSWER" != "y" ] && [ "$WO_ANSWER" != "Y" ]; then
                 wo_lib_error "Not installing WordOps" 1
             fi
         fi
-            wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
+        _run wo_backup_ee "Backing-up EE install"
-            wo_install_dep &
+        _run wo_remove_ee_cron "Removing EasyEngine cronjob"
-            wo_timesync &
+        _run wo_sync_db "Syncing WO database"
-            wo_lib_echo "Backing-up EE install" | tee -ai $wo_install_log
-            wo_backup_ee &
-            wo_lib_echo "Removing EasyEngine cronjob" | tee -ai $wo_install_log
-            wo_remove_ee_cron &
-            wo_lib_echo "Syncing WO database" | tee -ai $wo_install_log
-            wo_sync_db >> $wo_install_log 2>&1 &
-            secure_wo_db &
-            wo_lib_echo "Downloading WordOps " | tee -ai $wo_install_log
-            wo_download &
-            wait
-            wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-            wo_install
-            if command_exists nginx; then
-                wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log
-                wo_upgrade_nginx &
-            fi
-            wait
-            wo_update_latest &
-            wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
-            wo_install_acme_sh &
-            wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
-            wo_tweak_kernel &
-            if [ ! -f /opt/wo-kernel.sh ]; then
-                wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log
-                wo_systemd_tweak &
-            fi
-            if command_exists nginx; then
-                wo_nginx_tweak &
-            fi
-            if [ -d /etc/systemd/system/mariadb.service.d ]; then
-                wo_mariadb_tweak &
-            fi
-            wo_domain_suffix &
-            wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
-            {
-                wo_git_init &
-                wo_update_wp_cli &
-                wo_cheat_install &
-            } >> $wo_install_log
-            wait
-            wo_lib_echo "Cleaning-up EE previous install" | tee -ai $wo_install_log
-            wo_clean_ee >> $wo_install_log
-        else
-            # 3 - Fresh WO setup
-            wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
-            [ -z "$wo_travis" ] && {
-                wo_dist_upgrade >> $wo_install_log
-            }
-            wo_install_dep &
-            wo_timesync &
-            wo_lib_echo "Downloading WordOps " | tee -ai $wo_install_log
-            wo_download &
-            wait
-            if [ "$wo_travis" = "y" ]; then
-            wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-                wo_install_travis &
-            else
-                wo_git_config
-            wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
-                wo_install
     fi
+    _run wo_install_dep "Installing wo dependencies"
+    _run wo_timesync
     if [ "$ufw" = "y" ]; then
         wo_lib_echo "Configuring UFW" | tee -ai $wo_install_log
-                wo_ufw_setup &
+        wo_ufw_setup
     fi
-            wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
+    # skip steps if travis
-            wo_tweak_kernel &
+    if [ -z "$wo_travis" ]; then
+        _run wo_dist_upgrade
+        _run wo_download "Downloading WordOps"
+        wo_git_config
+        _run wo_install "Installing WordOps"
+    else
+        _run wo_install_travis "Installing WordOps"
+    fi
+    if [ -x /usr/local/bin/ee ]; then
+        _run wo_upgrade_nginx "Upgrading Nginx"
+        _run wo_clean_ee "Cleaning previous EasyEngine install"
+    fi
+    _run wo_install_acme_sh
+    _run wo_tweak_kernel "Applying Kernel tweaks"
     if [ ! -f /opt/wo-kernel.sh ]; then
-                wo_lib_echo "Adding systemd service tweak" | tee -ai $wo_install_log
+        _run wo_systemd_tweak "Adding systemd service tweak"
-                wo_systemd_tweak &
     fi
-            wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
+    if [ -x /usr/sbin/nginx ]; then
-            wo_install_acme_sh &
+        _run wo_nginx_tweak &
-            wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
-            {
-                secure_wo_db &
-                wo_cheat_install &
-                wo_domain_suffix &
-                wo_git_init &
-                wo_update_wp_cli &
-                wait
-            } >> $wo_install_log
-            wait
     fi
+    if [ -d /etc/systemd/system/mariadb.service.d ]; then
+        _run wo_mariadb_tweak &
     fi
+    _run wo_cheat_install "Running post-install steps"
+    _run wo_domain_suffix
+    _run wo_update_wp_cli
+    _run wo_update_latest
+    _run secure_wo_db
 
     wo sync >> $wo_install_log 2>&1