diff --git a/install b/install index 4be444a2..99ed159a 100644 --- a/install +++ b/install @@ -302,77 +302,80 @@ function ee_update_latest() 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 - elif [ "$ee_distro_version" == "trusty" ]; then - grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null - if [[ $? -ne 0 ]]; then - if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then - rm -rf /etc/apt/sources.list.d/rtcamp-nginx-trusty.list + if [ -f /etc/nginx/nginx.conf ]; then + 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 - 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 + elif [ "$ee_distro_version" == "trusty" ]; then + grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null + if [[ $? -ne 0 ]]; then + if [ -f /etc/apt/sources.list.d/rtcamp-nginx-trusty.list ]; then + 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 - 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 - elif [ "$ee_distro_version" == "wheezy" ]; then - grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null - #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null - if [[ $? -ne 0 ]]; then - # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then - # rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list - # else - # sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null - # fi - echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /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 + elif [ "$ee_distro_version" == "wheezy" ]; then + grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null + #grep -Hr "deb http://packages.dotdeb.org wheezy all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null + if [[ $? -ne 0 ]]; then + # if [ -f /etc/apt/sources.list.d/dotdeb-wheezy.list ]; then + # rm -rf /etc/apt/sources.list.d/dotdeb-wheezy.list + # else + # sed -i "/deb http:\/\/packages.dotdeb.org wheezy all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null + # fi + echo -e "deb http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /" >> /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 + 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 - 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 - elif [ "$ee_distro_version" == "jessie" ]; then - - grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null - #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null - if [[ $? -ne 0 ]]; 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 - 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 + elif [ "$ee_distro_version" == "jessie" ]; then + + grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null + #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null + if [[ $? -ne 0 ]]; 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 + 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 + 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 - 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