From e7b3d36419428accce860d78cfbf6a9c4b799b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Fri, 18 May 2018 14:19:24 -0600 Subject: [PATCH 1/4] swap for -gt 128 Now we are considering cases for swap with ram above 128. --- lib/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/install b/lib/install index 8afd868..c8e2205 100644 --- a/lib/install +++ b/lib/install @@ -431,7 +431,8 @@ swap_create() { swap_delete swapkb=$(grep SwapTotal /proc/meminfo | cut -f 2 -d ':' | tr -d ' ' | cut -f 1 -d 'k') fi - + + # https://help.ubuntu.com/community/SwapFaq if [[ -z $swapkb || $swapkb == "0" ]]; then if [[ -n $(conf_read swap-mem) && $(conf_read swap-mem) =~ ^[0-9]+$ ]]; then local newswap=$(conf_read swap-mem) @@ -451,6 +452,8 @@ swap_create() { local newswap="8" elif [[ $ram -le 128 ]]; then local newswap="11" + elif [[ $ram -gt 128 ]]; then + local newswap="15" else local newswap="0" fi From c37f8742b77d9c7278b60ead7c958c46c05d854e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Fri, 18 May 2018 15:25:27 -0600 Subject: [PATCH 2/4] messages improved New we have a successful message after install option zero, ad also we have a donation invitation. --- weby | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/weby b/weby index 1cf57dc..994e304 100644 --- a/weby +++ b/weby @@ -77,6 +77,7 @@ if [[ -a /opt/webinoly/webinoly.conf ]]; then echo "${gre}Webinoly Configuration file was found, so we will use it!${end}" else [[ -n $2 && $2 != "-ver="* ]] && tools_port $2 + newinst="true" fi # Write app version @@ -92,6 +93,24 @@ if [[ $setup == 4 ]]; then config_load fi + +# Message Center +if [[ $newinst == "true" && $setup == 0 ]]; then + echo "${blu}You have chosen the option '0', it means that you have to manually build your own stack." + echo "But, don't worry! With Webinoly this is an easy task, just use the stack command, i.e. 'sudo stack -lemp'" + echo "${gre}" + echo "Webinoly has been successfully installed!!!" +fi + +echo "${blu}" +echo "****************************************************************************" +echo "********************** D O N A T I O N S ***************************" +echo "*** If you like Webinoly, buy me a coffee or a beer to show support. ***" +echo "************ PayPal: https://www.paypal.me/qrokes ******************" +echo "****************************************************************************" +echo "${end}" + + # Remove Installation File sudo rm weby app_purge From 07d109a7b5ed20620919a84fa5c67d223d4f9fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Fri, 18 May 2018 16:55:57 -0600 Subject: [PATCH 3/4] ubuntu bionic support Added support for Ubuntu 18.04 bionic beaver. --- lib/general | 4 ++-- plugins/stack | 6 ++++-- weby | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/general b/lib/general index d0184f3..97ecd9b 100644 --- a/lib/general +++ b/lib/general @@ -102,7 +102,7 @@ db_delete() { check_osname() { local distr=`echo $(lsb_release -i | cut -d':' -f 2)` local osver=`echo $(lsb_release -c | cut -d':' -f 2)` - if ! [[ $distr == "Ubuntu" && $osver =~ ^(trusty|xenial|zesty|artful)$ ]]; then + if ! [[ $distr == "Ubuntu" && $osver =~ ^(trusty|xenial|zesty|artful|bionic)$ ]]; then echo "${red}" >&2 echo "****************************************************************************" >&2 echo "**** This OS is not supported by Webinoly and could not work properly ****" >&2 @@ -134,7 +134,7 @@ mysql_client_install() { sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main" ;; - "xenial"|"zesty"|"artful") + "xenial"|"zesty"|"artful"|"bionic") sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.syringanetworks.net/mariadb/repo/10.2/ubuntu $osname main" ;; diff --git a/plugins/stack b/plugins/stack index eefdf99..3fda788 100644 --- a/plugins/stack +++ b/plugins/stack @@ -196,8 +196,10 @@ elif [[ $arg == "-purge" && $opt == "-mysql" ]]; then conf_delete delautopma fi sudo service mysql stop - sudo apt-get -y purge mariadb-server mariadb-common mysql-common debconf-utils + echo "mariadb-server-10.2 mariadb-server-10.2/postrm_remove_databases boolean true" | debconf-set-selections + sudo apt-get -y purge mariadb-server mariadb-common mysql-common sudo apt-get -y purge mariadb-client + sudo apt-get -y purge debconf-utils sudo apt-get -y autoremove os_name=$(check_osname) @@ -207,7 +209,7 @@ elif [[ $arg == "-purge" && $opt == "-mysql" ]]; then "trusty") sudo apt-key del 0xcbcb082a1bb943db ;; - "xenial"|"zesty"|"artful") + "xenial"|"zesty"|"artful"|"bionic") sudo apt-key del 0xF1656F24C74CD1D8 ;; esac diff --git a/weby b/weby index 994e304..797a99f 100644 --- a/weby +++ b/weby @@ -1,13 +1,13 @@ #!/bin/bash # Webinoly Installation Script. -webyversion="1.4.2-beta" +webyversion="1.4.2" # Check OS support distr=`echo $(lsb_release -i | cut -d':' -f 2)` osver=`echo $(lsb_release -c | cut -d':' -f 2)` -if ! [[ $distr == "Ubuntu" && $osver =~ ^(xenial)$ ]]; then +if ! [[ $distr == "Ubuntu" && $osver =~ ^(xenial|bionic)$ ]]; then echo "$(tput setaf 1)" echo "****************************************************************************" echo "**** This OS is not supported by Webinoly and could not work properly ****" From 3d6b3c2a0162624d2ff7438dcca9ec21fd58116c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Fri, 18 May 2018 18:35:43 -0600 Subject: [PATCH 4/4] README updated Support for Ubuntu 18.04 bionic --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21f7fa1..79432fc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Webinoly provides a set of tools and commands that facilitate the web server adm - Log viewer in real time. ### Requirements -* Ubuntu 16.04 +* Ubuntu 16.04 or 18.04 ## Usage