lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge tag 'v3.3.6' into develop 

EasyEngine v3.3.6
feature/refactor-php
harshadyeola 10 years ago
parent
f4bfa62a8c ca2fc9e812
commit
1162fd9e42
5 changed files with 78 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      CHANGELOG.txt
  2. 4
      docs/ee.8
  3. 2
      ee/core/variables.py
  4. 137
      install
  5. 4
      setup.py

3
CHANGELOG.txt
View File

@ -1,3 +1,6 @@
v 3.3.6 - Sep 4, 2015
- Fix #611
v 3.3.5 - Sep 2, 2015 v 3.3.5 - Sep 2, 2015
- Introduced new support of --force/-f in delete command of site - Introduced new support of --force/-f in delete command of site
- Removes database entry or nginx configuration of site from system - Removes database entry or nginx configuration of site from system

4
docs/ee.8
View File

@ -1,4 +1,4 @@
.TH ee 8 "EasyEngine (ee) version: 3.3.5" "Aug 11,2015" "EasyEngine" .TH ee 8 "EasyEngine (ee) version: 3.3.6" "Sept 4,2015" "EasyEngine"
.SH NAME .SH NAME
.B EasyEngine (ee) .B EasyEngine (ee)
\- Manage Nginx Based Websites. \- Manage Nginx Based Websites.
@ -284,7 +284,7 @@ Install, activate, configure Nginx-helper and Redis Object Cache Plugin, Configu
.TP .TP
.B --hhvm .B --hhvm
.br .br
Install, activate Nginx-helper and configure NGINX for HHVM. Install, activate Nginx-helper and configure NGINX for HHVM.
.SH FILES .SH FILES
.br .br
/etc/easyengine/ee.conf /etc/easyengine/ee.conf

2
ee/core/variables.py
View File

@ -12,7 +12,7 @@ class EEVariables():
"""Intialization of core variables""" """Intialization of core variables"""
# EasyEngine version # EasyEngine version
ee_version = "3.3.5" ee_version = "3.3.6"
# EasyEngine packages versions # EasyEngine packages versions

137
install
View File

@ -48,7 +48,7 @@ fi
# Define variables for later use # Define variables for later use
ee_branch=$1 ee_branch=$1
readonly ee_version_old="2.2.3" readonly ee_version_old="2.2.3"
readonly ee_version_new="3.3.5" readonly ee_version_new="3.3.6"
readonly ee_log_dir=/var/log/ee/ readonly ee_log_dir=/var/log/ee/
readonly ee_install_log=/var/log/ee/install.log readonly ee_install_log=/var/log/ee/install.log
readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}') readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@ -302,77 +302,80 @@ function ee_update_latest()
fi fi
fi fi
fi fi
ee_lib_echo "Updating Nginx configuration, please wait..."
# From version 3.1.10 we are using Suse builder for repository
if [ "$ee_distro_version" == "precise" ]; then
grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
if [[ $? -ne 0 ]]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list
fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi if [ -f /etc/nginx/nginx.conf ]; then
elif [ "$ee_distro_version" == "trusty" ]; then ee_lib_echo "Updating Nginx configuration, please wait..."
grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null # From version 3.1.10 we are using Suse builder for repository
if [[ $? -ne 0 ]]; then if [ "$ee_distro_version" == "precise" ]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list if [[ $? -ne 0 ]]; then
if [ -f /etc/apt/sources.list.d/rtcamp-nginx-precise.list ]; then
rm -rf /etc/apt/sources.list.d/rtcamp-nginx-precise.list
fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_12.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list elif [ "$ee_distro_version" == "trusty" ]; then
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03' grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - if [[ $? -ne 0 ]]; then
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list
fi
echo -e "\ndeb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /" >> /etc/apt/sources.list.d/ee-repo.list
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null elif [ "$ee_distro_version" == "wheezy" ]; then
apt-get update grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
fi if [[ $? -ne 0 ]]; then
elif [ "$ee_distro_version" == "wheezy" ]; then # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then
grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null # rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list
#grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null # else
if [[ $? -ne 0 ]]; then # sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
# if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then # fi
# rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
# else gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
# sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
# fi if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /etc/apt/sources.list.d/ee-repo.list mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03' fi
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null elif [ "$ee_distro_version" == "jessie" ]; then
mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
apt-get update grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
fi if [[ $? -ne 0 ]]; then
elif [ "$ee_distro_version" == "jessie" ]; then #sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null
echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list
grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03'
#grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add -
if [[ $? -ne 0 ]]; then if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then
#sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null
echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /" >> /etc/apt/sources.list.d/ee-repo.list fi
gpg --keyserver "hkp://pgp.mit.edu" --recv-keys '3050AC3CD2AE6F03' mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
gpg -a --export --armor '3050AC3CD2AE6F03' | apt-key add - mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
if [ -f /etc/nginx/conf.d/ee-nginx.conf ]; then apt-get update
mv /etc/nginx/conf.d/ee-nginx.conf /etc/nginx/conf.d/ee-nginx.conf.old &>> /dev/null apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null
mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.old &>> /dev/null
apt-get update
apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom
fi fi
fi fi

4
setup.py
View File

@ -54,7 +54,7 @@ except Exception as e:
os.system("git config --global user.email {0}".format(ee_email)) os.system("git config --global user.email {0}".format(ee_email))
setup(name='ee', setup(name='ee',
version='3.3.5', version='3.3.6',
description=long_description, description=long_description,
long_description=long_description, long_description=long_description,
classifiers=[], classifiers=[],
@ -80,7 +80,7 @@ setup(name='ee',
'python-apt', 'python-apt',
'pynginxconfig', 'pynginxconfig',
'pymysql3 == 0.4', 'pymysql3 == 0.4',
'psutil', 'psutil == 3.1.1',
'sh', 'sh',
'sqlalchemy', 'sqlalchemy',
], ],

Write Preview
Loading…
Cancel
Save