Improve install script

2019-09-17 03:20:12 +02:00 · 2019-09-17 03:20:12 +02:00 · 91097c87dc
parent 7b6532f118
commit 91097c87dc
2 changed files with 69 additions and 70 deletions
--- a/README.md
+++ b/README.md
@ -11,13 +11,13 @@

 <p align="center">
 <a href="https://travis-ci.org/WordOps/WordOps" target="_blank"><img src="https://travis-ci.org/WordOps/WordOps.svg?branch=master" alt="build"></a>
-<img src="https://img.shields.io/github/license/wordops/wordops.svg" alt="MIT">
-<img src="https://img.shields.io/github/last-commit/wordops/wordops.svg" alt="Commits">
+<img src="https://img.shields.io/github/license/wordops/wordops.svg?cacheSeconds=86400" alt="MIT">
+<img src="https://img.shields.io/github/last-commit/wordops/wordops.svg?cacheSeconds=86400" alt="Commits">
 <img alt="GitHub release" src="https://img.shields.io/github/release/WordOps/WordOps.svg">
 <br><img src="https://netdata.wordops.eu/netdata/api/v1/badge.svg?chart=web_log_wops.cc.requests_per_url&options=unaligned&dimensions=download&group=sum&after=-86400&label=today&units=installations&precision=0&value_color=%230055AA" alt="WordOps install" >
 <a href="https://www.codacy.com/app/VirtuBox/WordOps?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=WordOps/WordOps&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/fe9100fd2c634de7882ecec17f00a11a" alt="codacy"/></a>
-<a href="https://twitter.com/WordOps_" target="_blank"><img src="https://img.shields.io/badge/twitter-%40WordOps__-blue.svg?style=flat&logo=twitter" alt="Badge Twitter" /></a>
-<a href="https://chat.wordops.net" target="_blank"><img src="https://img.shields.io/badge/slack-WordOps-4A154B.svg?style=flat&logo=rocket.chat" alt="Badge Slack" /></a>
+<a href="https://twitter.com/WordOps_" target="_blank"><img src="https://img.shields.io/badge/twitter-%40WordOps__-blue.svg?style=flat&logo=twitter&cacheSeconds=86400" alt="Badge Twitter" /></a>
+<a href="https://chat.wordops.net" target="_blank"><img src="https://img.shields.io/badge/Rocket.Chat-WordOps-DB2323.svg?style=flat&cacheSeconds=86400&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAVOSURBVFhH7ZZbaJRHFIDP/P/uupsYkzQkrWIS3Wh0E280fciDUiyC2hdrQxUUBLFqaauoVFFoevGh6IOCWIQqfSiFVqIPrVSlIrYStPqQKhJz0e5v3GwuBk2q3WQv/2V6ztnZWxIrtXlq+8Hyzznz75wzcy7zw38eoZ7MTwCu4oqK8nyfb6pp2040Hg+d6e7u/xTAUa9MOOxA6/TpL7g9noMawCoQopRnFGg5JKVssh3n89qurvtKPWGgTYDacHgIDUdGGyfwhQpdiA88ut7WWVX1vlT/mSjSIaCF71ZVnUbFaqUaF3zvW/zdxlOpBClLhBDon4jiCfVrmmZYjnMzGou1vNLXN6L+8pfk5MBNv78sT4gOVBYr1XOBDo6ggxcdIb6cGwyexfVsNTWGHAcIPAXMOfgoKT0d4XKB8HpB6DpI0wQnFsOEGZur6EinLeXuwL17P5CY1GYY40DbjBmvunX9ZyWm0fLyIG/JEvAtXgzeRYvAXVEBwuPBFXAJNCyjUYjfuQOxlhYYuXwZYjdugLQs/i9alejJ195E4p2KcDjKSsUYB9pnzmxwadppJYJeXAzFW7fClLVrQSsoUNpnY4bD8Pvx4/CkqSntCDrRHPd6X5/X1hZJKkY50FFdPVOz7RZUcg7kL1sGZQcOgF5UxPPPQ7y9HR7s2AGJYJBlDMl3sw3jTbTB4UiXFEpCs6xjKeNT1qyBqceO/SPjxKRAAKbjKdCTwIp54+6sWetZQNIOdPj9dTi5gsaTamuhdP9+nJ2YktcKC+El3AwlLeM4ez9WttMWNCHeUkMo2bWLszwNJln0+nU+zmys3l5OOEkVoJCJBIw0N4PZ1aU0Sdzl5VC4bh2PcaO1DZWV1TTOhEDKl+lJ2e6rr2ddikeHD0PP+vXQvWoVDF+6xDozFILQ8uXQu2kT9G3ZQguwfmDPHujduBFCK1dC/PZt1qXIX7pUjdAhTaujZ8YBITj2wudLllcW0atXkwM6iWvXeEiLO1h6ROzWLe4FBO2eIJlKMhu9pESNADxudyE9MyGQsoeeTiQCzvAw61IUbd7MJeiaNo2Tk8ijfrBgAce1cMOGtNPF27bxJjyzZ8NkPIVs6NRSJEzzgRomwSTci11Q0u/xyZMYkVwc05TSxp6WjeNIJ5FQQgZ+F+dG07d9O69/x++32svLp5HdTAhs+yTGkc9x8MgRsIeGWJ+Ck3J0VWAXFG63EjLwu9Qhs6Akjpw/z2PMluZAd3cvjdMrBu7f78LL4wSNrYEBTizn8WOe+6dQ9fRjaNRdYaMDH/IEkrMlx+Xai5OtNKZe/vDgQdY/L3iq8OTUKejBvLEHB1mHLnw21zCusIDkOBDo7PwDP8XeUyJY/f1q9PegvhA5exbCq1fDwL59XC24MYkZdPSbYPAT9RqTGyiko6pqhQ7AwSrAun/x0CHWE8MXLkDk4kXwLlzItyF1uNR1bD98CAnD4NKjeFM1pcD8i+AHwe6AYXxBYlKbZIwDnX7/CeyKb9O4DEMwpaGBVuCjHGhsxAg+9dtiDGgphv9tSgA0zjOMTA1mkeMAXsXzXUL8ihnsomu4EtsstdvBo0chcu4cO/Is8I0o7vgmPs84lvVVTSjUp6bGJe1A+5w5BbplXUHFfJL10lLQsMnQvZ42LCUV/c64prVPknKGJWURdlAXfhSOCCkfYf50QH7+b9n3/bNgB1praiZ74vHvUXiNteOALrTiZ8WWmmDwF6WaEDDfAN7F3eqmiV1FUFehHq2hMyb2sgdo+Ef8NVYbxs6yoaFx4zihoDHRU1eXF6qv96GYDtH//EsB+BOmU3nrC4LJegAAAABJRU5ErkJggg==" alt="Badge Rocket.chat" /></a>
 </p>

 <p align="center">
--- a/131
+++ b/131
@ -133,7 +133,6 @@ echo ""
 # 1- Check whether lsb_release is installed, and if not, install it
 ###
 if ! command_exists lsb_release; then
-    wo_lib_echo "Installing lsb-release, please /bin/bash --init-file <(echo 'source /etc/bash_completion.d/wo_auto.rc')..."
    apt-get install lsb-release -qq
 fi

@ -245,7 +244,7 @@ wo_timesync() {
        # enable ntp
        timedatectl set-ntp 1
    fi
-}
+} >> $wo_install_log 2>&1

 ###
 # 3 - Create/migrate the essentials
@ -442,28 +441,35 @@ wo_install_acme_sh() {
    fi
 }

-# Clone Github repository if it doesn't exist
-wo_install() {
-    {
-        rm -f /etc/bash_completion.d/wo_auto.rc
-        rm -rf /var/lib/wo/tmp/WordOps-*
-        if [ -z "$wo_version" ]; then
-            curl -sL https://github.com/WordOps/WordOps/archive/${wo_branch}.tar.gz | tar -I pigz -xf - -C /var/lib/wo/tmp
-            cd "/var/lib/wo/tmp/WordOps-$wo_branch" || exit 1
-        else
-            curl -sL https://github.com/WordOps/WordOps/archive/v${wo_version}.tar.gz | tar -I pigz -xf - -C /var/lib/wo/tmp
-            cd "/var/lib/wo/tmp/WordOps-$wo_version" || exit 1
-        fi
+# Download WordOps
+wo_download() {
+    rm -f /etc/bash_completion.d/wo_auto.rc
+    rm -rf /var/lib/wo/tmp/WordOps-*
+    if [ -z "$wo_version" ]; then
+        curl -sL https://github.com/WordOps/WordOps/archive/${wo_branch}.tar.gz | tar -I pigz -xf - -C /var/lib/wo/tmp
+        mv "/var/lib/wo/tmp/WordOps-$wo_branch" /var/lib/wo/tmp/WordOps-install
+    else
+        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_install_log" 2>&1
+wo_git_config() {

    if [ "$wo_force_install" = "y" ]; then
        [ ! -f "$HOME/.gitconfig" ] && { bash -c 'echo -e "[user]\n\tname = $USER\n\temail = root@$HOSTNAME.local" > $HOME/.gitconfig'; }
    fi

-    # install and redirect log to not print python package install
+    # .gitconfig inital setup
+    cd /var/lib/wo/tmp/WordOps-install || exit 1
    python3 gitconfig.py
+
+}
+
+# WordOps install
+wo_install() {
+
+    cd /var/lib/wo/tmp/WordOps-install || exit 1
    python3 setup.py install >> $wo_install_log 2>&1

 }
@ -536,9 +542,6 @@ wo_upgrade_nginx() {
        sed -i "s/locations-php72.conf/locations-wo.conf/" /etc/nginx/sites-available/*
        sed -i "s/locations-php73.conf/locations-wo.conf/" /etc/nginx/sites-available/*
        sed -i "s/htpasswd-ee/htpasswd-wo/" /etc/nginx/common/acl.conf
-        sed -i "s/php.conf/php72.conf/" /etc/nginx/sites-available/*
-        sed -i "s/php7.conf/php72.conf/" /etc/nginx/sites-available/*
-        sed -i "s/php7.conf/php72.conf/" /etc/nginx/sites-available/*
        sed -i 's/ssl on;/#ssl on;/' /var/www/*/conf/nginx/ssl.conf

        # update redis.conf headers
@ -639,22 +642,22 @@ wo_git_init() {
 }

 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 >> /var/log/wo/install.log 2>&1
-}
+    /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 >> /var/log/wo/install.log 2>&1
-}
+    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() {

@ -671,7 +674,7 @@ 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() {

@ -691,11 +694,11 @@ 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
@ -724,11 +727,11 @@ wo_nginx_tweak() {

 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 >> /var/log/wo/install.log 2>&1
-}
+    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
@ -798,7 +801,7 @@ 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
@ -825,20 +828,19 @@ else
        wo_lib_echo "Backing-up WO install" | tee -ai $wo_install_log
        wo_backup_wo &
        secure_wo_db &
-        wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
+        wo_lib_echo "Downloading WordOps " | tee -ai $wo_install_log
+        wo_download &
        wo_clean &
        wait
+        wo_git_config
+        wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
        if [ "$wo_travis" = "y" ]; then
            wo_install_travis &
        else
-            if [ -f "$HOME/.gitconfig" ]; then
-                wo_install >> $wo_install_log 2>&1 &
-            else
-                wo_install
-            fi
+            wo_install
        fi
        wo_update_latest &
-        if [ ! -d /opt/acme/.sh ]; then
+        if [ ! -d /opt/acme.sh ]; then
            wo_lib_echo "Updating acme.sh" | tee -ai $wo_install_log
            wo_install_acme_sh &
        fi
@ -869,32 +871,30 @@ else
                fi
            fi
            wo_lib_echo "Installing wo dependencies " | tee -ai $wo_install_log
-            wo_install_dep >> $wo_install_log 2>&1 &
-            wo_timesync >> $wo_install_log 2>&1 &
+            wo_install_dep &
+            wo_timesync &
            wo_lib_echo "Backing-up EE install" | tee -ai $wo_install_log
-            wo_backup_ee >> $wo_install_log 2>&1 &
+            wo_backup_ee &
            wo_lib_echo "Removing EasyEngine cronjob" | tee -ai $wo_install_log
-            wo_remove_ee_cron >> $wo_install_log 2>&1 &
+            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_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
-            if [ -f "$HOME/.gitconfig" ]; then
-                wo_install >> $wo_install_log 2>&1 &
-            else
-                wo_install | tee -ai $wo_install_log
-            fi
+            wo_install
            if command_exists nginx; then
                wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log
-                wo_upgrade_nginx >> $wo_install_log 2>&1 &
+                wo_upgrade_nginx &
            fi
            wait
-            wo_update_latest >> $wo_install_log 2>&1 &
+            wo_update_latest &
            wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
-            wo_install_acme_sh >> $wo_install_log 2>&1 &
+            wo_install_acme_sh &
            wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
-            wo_tweak_kernel >> $wo_install_log 2>&1 &
+            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 &
@ -905,7 +905,7 @@ else
            if [ -d /etc/systemd/system/mariadb.service.d ]; then
                wo_mariadb_tweak &
            fi
-            wo_domain_suffix >> $wo_install_log &
+            wo_domain_suffix &
            wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
            {
                wo_git_init &
@ -921,33 +921,32 @@ else
            [ -z "$wo_travis" ] && {
                wo_dist_upgrade >> $wo_install_log
            }
-            wo_install_dep >> $wo_install_log &
-            wo_timesync >> $wo_install_log &
+            wo_install_dep &
+            wo_timesync &
+            wo_lib_echo "Downloading WordOps " | tee -ai $wo_install_log
+            wo_download &
            wait
+            wo_git_config
            wo_lib_echo "Installing WordOps " | tee -ai $wo_install_log
            if [ "$wo_travis" = "y" ]; then
-                wo_install_travis | tee -ai $wo_install_log &
+                wo_install_travis &
            else
-                if [ -f "$HOME/.gitconfig" ]; then
-                    wo_install >> $wo_install_log 2>&1 &
-                else
-                    wo_install | tee -ai $wo_install_log
-                fi
+                wo_install
            fi
            if [ "$ufw" = "y" ]; then
                wo_lib_echo "Configuring UFW" | tee -ai $wo_install_log
                wo_ufw_setup &
            fi
            wo_lib_echo "Applying Kernel tweaks" | tee -ai $wo_install_log
-            wo_tweak_kernel >> $wo_install_log 2>&1 &
+            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 >> $wo_install_log 2>&1 &
+                wo_systemd_tweak &
            fi
            wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log
+            wo_install_acme_sh &
            wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log
            {
-                wo_install_acme_sh &
                secure_wo_db &
                wo_cheat_install &
                wo_domain_suffix &