diff --git a/scripts/rtinst b/scripts/rtinst index 885ed02..73e730f 100755 --- a/scripts/rtinst +++ b/scripts/rtinst @@ -326,12 +326,6 @@ echo "It will take approx 10 minutes for the script to complete" echo #update amd upgrade system -if [ "$fullrel" = "Ubuntu 12.04.5 LTS" ]; then - wget --no-check-certificate https://raw.githubusercontent.com/arakasi72/rtinst/master/conf/sources1204 >> $logfile 2>&1 || error_exit "Unable to download sources file from https://help.ubuntu.com/12.04/sample/sources.list" - cp /etc/apt/sources.list /etc/apt/sources.list.bak - mv sources1204 /etc/apt/sources.list -fi - echo "Updating package lists" | tee $logfile apt-get update 2>&1 >>$logfile | tee -a $logfile if ! [ $? = 0 ]; then @@ -513,19 +507,7 @@ ftpport=$(random 41005 48995) if [ $(dpkg-query -W -f='${Status}' "vsftpd" 2>/dev/null | grep -c "ok installed") -eq 0 ]; then echo "Installing vsftpd" | tee -a $logfile - - if [ $relno = 12 ]; then - add-apt-repository -y ppa:thefrontiergroup/vsftpd >> $logfile 2>&1 - apt-get update >> $logfile 2>&1 - apt-get -y install vsftpd >> $logfile 2>&1 - elif [ $relno = 7 ]; then - echo "deb http://ftp.cyconet.org/debian wheezy-updates main non-free contrib" >> /etc/apt/sources.list.d/wheezy-updates.cyconet2.list - aptitude update >> $logfile 2>&1 || error_exit "problem updating package lists" - aptitude -o Aptitude::Cmdline::ignore-trust-violations=true -y install -t wheezy-updates debian-cyconet-archive-keyring vsftpd >> $logfile 2>&1 || error_exit "Unable to download vsftpd" - else - apt-get -y install vsftpd >> $logfile 2>&1 - fi - + apt-get -y install vsftpd >> $logfile 2>&1 fi sed -i '/^\(\s\|#\)*anonymous_enable/ c\anonymous_enable=NO' /etc/vsftpd.conf @@ -710,13 +692,13 @@ cp -f /etc/rtinst/conf/nginxsitedl /etc/nginx/sites-available/dload-loc echo "location ~ \.php$ {" > /etc/nginx/conf.d/php echo " fastcgi_split_path_info ^(.+\.php)(/.+)$;" >> /etc/nginx/conf.d/php -if [ $relno = 12 ]; then - echo " fastcgi_pass 127.0.0.1:9000;" >> /etc/nginx/conf.d/php -elif [ "$phpver" = "php7.0" ]; then + +if [ "$phpver" = "php7.0" ]; then echo " fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;" >> /etc/nginx/conf.d/php else echo " fastcgi_pass unix:/var/run/php5-fpm.sock;" >> /etc/nginx/conf.d/php fi + echo " fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;" >> /etc/nginx/conf.d/php echo " fastcgi_index index.php;" >> /etc/nginx/conf.d/php echo " include fastcgi_params;" >> /etc/nginx/conf.d/php