diff --git a/lib/install b/lib/install index f548742..325e225 100644 --- a/lib/install +++ b/lib/install @@ -137,7 +137,7 @@ php_install() { sudo apt-get install -y language-pack-en-base sudo LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php sudo apt-get update - sudo apt-get -y install php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-mcrypt php${ver}-readline php${ver}-common php${ver}-recode php${ver}-mysql php${ver}-cli php${ver}-mbstring php${ver}-bcmath php${ver}-mysql php${ver}-opcache php${ver}-zip php${ver}-xml php-memcached php-imagick php-memcache memcached graphviz php-pear php-xdebug php-msgpack php${ver}-soap unzip pwgen + sudo apt-get -y install php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-mcrypt php${ver}-readline php${ver}-common php${ver}-recode php${ver}-mysql php${ver}-cli php${ver}-mbstring php${ver}-bcmath php${ver}-mysql php${ver}-opcache php${ver}-zip php${ver}-xml php-imagick graphviz php-pear php-xdebug php-msgpack php${ver}-soap unzip pwgen sudo cp /etc/php/$(conf_read php-ver)/fpm/php.ini /opt/webinoly/templates/source/ sudo cp /etc/php/$(conf_read php-ver)/fpm/pool.d/www.conf /opt/webinoly/templates/source/ @@ -328,6 +328,9 @@ php_tool() { sudo apt-get update sudo apt-get -y install redis-server php-redis + # Memcached (Object Cache) + sudo apt-get -y install php-memcached php-memcache memcached + # Postfix mail echo "postfix postfix/main_mailer_type select Internet Site" | debconf-set-selections echo "postfix postfix/mailname string $hostname" | debconf-set-selections @@ -818,6 +821,8 @@ system_info() { echo "${blu}" echo "[SYSTEM]" echo "Operating System: $(sudo cat /proc/version) " + echo "$(sudo lsb_release -d) " + echo "$(sudo lsb_release -c) " echo "Cores: $(grep ^processor /proc/cpuinfo | wc -l) " echo "RAM: $(grep MemTotal /proc/meminfo | cut -f 2 -d ':' | tr -d ' ' | cut -f 1 -d 'k')kb " echo "SWAP: $(grep SwapTotal /proc/meminfo | cut -f 2 -d ':' | tr -d ' ' | cut -f 1 -d 'k')kb " diff --git a/plugins/stack b/plugins/stack index ce15d2b..d2edc03 100644 --- a/plugins/stack +++ b/plugins/stack @@ -71,6 +71,7 @@ elif [[ $arg == "-purge" && ( $opt == "-html" || $opt == "-nginx" ) ]]; then sudo service nginx stop sudo apt-get -y purge nginx nginx-common sudo apt-get -y purge letsencrypt python-boto duplicity duply + echo | sudo add-apt-repository --remove 'ppa:nginx/stable' sudo apt-get -y autoremove sudo rm $HOME/www sudo rm $HOME/sites-available @@ -119,9 +120,10 @@ elif [[ $arg == "-purge" && $opt == "-php" ]]; then stack -pma -purge fi sudo service php*-fpm stop - sudo apt-get -y purge php*-fpm php*-curl php*-gd php*-imap php*-mcrypt php*-readline php*-common php*-recode php*-mysql php*-cli php*-mbstring php*-bcmath php*-mysql php*-opcache php*-zip php*-xml php*-soap php-memcached php-imagick php-memcache memcached graphviz php-pear php-xdebug php-msgpack unzip + sudo apt-get -y purge php*-fpm php*-curl php*-gd php*-imap php*-mcrypt php*-readline php*-common php*-recode php*-mysql php*-cli php*-mbstring php*-bcmath php*-mysql php*-opcache php*-zip php*-xml php*-soap php-imagick graphviz php-pear php-xdebug php-msgpack unzip + sudo apt-get -y purge php-memcached php-memcache memcached sudo apt-get -y purge redis-server php-redis postfix - sudo add-apt-repository --remove 'ppa:ondrej/php' + echo | sudo add-apt-repository --remove 'ppa:ondrej/php' sudo apt-get -y autoremove sudo rm -rf /etc/php sudo rm /opt/webinoly/templates/source/* @@ -229,12 +231,12 @@ elif [[ $arg == "-purge" && $opt == "-pma" ]]; then elif [[ $arg == "-purge" && $opt == "-web-tools" ]]; then if [[ $(conf_read web-tool) != "true" ]]; then - echo "${red} Web Tools (Postfix, Redis, Duplicity and Letsencrypt) are not installed, hence can not be deleted! ${end}" + echo "${red} Web Tools (Postfix, Redis, Memcached, Duplicity and Letsencrypt) are not installed, hence can not be deleted! ${end}" exit 1 fi echo "" - echo "${red} ¡ C A U T I O N ! You are about to remove all your Web Tools (Postfix, Redis, Duplicity and Letsencrypt) from your server! ${end}" + echo "${red} ¡ C A U T I O N ! You are about to remove all your Web Tools (Postfix, Redis, Memcached, Duplicity and Letsencrypt) from your server! ${end}" echo "" if [ "$(conf_read delall)" != "true" ]; then echo " ${blu} Are you sure [y/N]? ${end} " @@ -247,7 +249,7 @@ elif [[ $arg == "-purge" && $opt == "-web-tools" ]]; then fi if [[ $answer == [Yy] || $(conf_read delall) == "true" ]]; then - sudo apt-get -y purge redis-server php-redis postfix letsencrypt python-boto duplicity duply + sudo apt-get -y purge redis-server php-redis postfix letsencrypt python-boto duplicity duply php-memcached php-memcache memcached sudo apt-get -y autoremove conf_write web-tool purged echo "" diff --git a/plugins/webinoly b/plugins/webinoly index 39efe09..62baa41 100644 --- a/plugins/webinoly +++ b/plugins/webinoly @@ -13,7 +13,7 @@ if [ "$opt" == "-update" ]; then if [[ $arg == '-vbeta' ]]; then sudo wget --timeout=15 -qrO weby https://s3.amazonaws.com/dl.qrokes.com/webinoly/beta/weby && sudo bash weby -vbeta else - sudo wget --timeout=15 -qrO weby qrok.es/wy && sudo bash weby 0 + sudo wget --timeout=15 -qrO weby qrok.es/wyupd && sudo bash weby 0 fi echo "" echo "${gre}Webinoly App has been updated successfully!${end}"