Update rtinst

README.md

@@ -1,7 +1,6 @@
 ## rtinst
 
-### NOTE: Please note there are some minor changes to how the script is installed and run.
-If you are familiar with rtinst please check the guide to avoid any confusion
+### NOTE: THIS IS RELEASE DEB7UBU12 - Installs rtinst on OS's Ubu12, Ubu13, and Deb7 which are no longer supported in the main rtinst releases
 
 #### 30 Second Guide
 
@@ -10,7 +9,7 @@ Ubuntu and Debian Seedbox Installation
 Download and run setup (if logged in as root, do not need to use sudo)
 
 	wget --no-check-certificate https://raw.githubusercontent.com/arakasi72/rtinst/master/rtsetup
-	sudo bash rtsetup
+	sudo bash rtsetup deb7ubu12
 
 and then to run the main script, ([check the options you can use](https://github.com/arakasi72/rtinst/wiki/Guide#21-main-script-options)):
 

conf/sources1204

@@ -0,0 +1,56 @@
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+deb http://de.archive.ubuntu.com/ubuntu/ precise main restricted
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://de.archive.ubuntu.com/ubuntu/ precise-updates main restricted
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://de.archive.ubuntu.com/ubuntu/ precise universe
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise universe
+deb http://de.archive.ubuntu.com/ubuntu/ precise-updates universe
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team, and may not be under a free licence. Please satisfy yourself as to
+## your rights to use the software. Also, please note that software in
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://de.archive.ubuntu.com/ubuntu/ precise multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ precise-updates multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb http://de.archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse
+deb-src http://de.archive.ubuntu.com/ubuntu/ precise-backports main restricted universe multiverse
+
+deb http://security.ubuntu.com/ubuntu precise-security main restricted
+deb-src http://security.ubuntu.com/ubuntu precise-security main restricted
+deb http://security.ubuntu.com/ubuntu precise-security universe
+deb-src http://security.ubuntu.com/ubuntu precise-security universe
+deb http://security.ubuntu.com/ubuntu precise-security multiverse
+deb-src http://security.ubuntu.com/ubuntu precise-security multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu precise partner
+# deb-src http://archive.canonical.com/ubuntu precise partner
+
+## Uncomment the following two lines to add software from Ubuntu's
+## 'extras' repository.
+## This software is not part of Ubuntu, but is offered by third-party
+## developers who want to ship their latest software.
+# deb http://extras.ubuntu.com/ubuntu precise main
+# deb-src http://extras.ubuntu.com/ubuntu precise main

scripts/rtinst

@@ -48,7 +48,7 @@ portdefault=1
 logfile="/dev/null"
 install_rt=0
 sshport=''
-rudevflag=0
+rudevflag=1
 passfile='/etc/nginx/.htpasswd'
 package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl cfv dtach htop irssi libcloog-ppl-dev libcppunit-dev libcurl3 libncurses5-dev libterm-readline-gnu-perl libsigc++-2.0-dev libperl-dev libtool libxml2-dev ncurses-base ncurses-term ntp patch pkg-config $phpver-fpm $phpver $phpver-cli $phpver-dev $phpver-curl $geoipver $phpver-mcrypt $phpver-xmlrpc python-scgi screen subversion texinfo unzip zlib1g-dev libcurl4-openssl-dev mediainfo python-software-properties software-properties-common aptitude $phpver-json nginx-full apache2-utils git libarchive-zip-perl libnet-ssleay-perl libhtml-parser-perl libxml-libxml-perl libjson-perl libjson-xs-perl libxml-libxslt-perl libjson-rpc-perl libarchive-zip-perl"
 Install_list=""
@@ -194,13 +194,12 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 # determine system
-if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 14 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 8 ])  || ([ "$osname" = "Raspbian" ] && [ $relno -ge 8 ]); then
+if ([ "$osname" = "Ubuntu" ] && [ $relno -ge 12 ] && [ $relno -le 17 ]) || ([ "$osname" = "Debian" ] && [ $relno -ge 7 ] && [ $relno -le 9 ])  || ([ "$osname" = "Raspbian" ] && [ $relno -ge 7 ] && [ $relno -le 8 ]); then
   echo $fullrel
 else
  echo $fullrel
- echo "Only Ubuntu release 14 and later, and Debian and Raspbian release 8 and later, are supported"
+ echo "Only Ubuntu releases 12 to 17, and Debian and Raspbian releases 7 to 9, are supported"
  echo "Your system does not appear to be supported"
- echo "Check https://github.com/arakasi72/rtinst/wiki/Installing-on-Older-OS to see if it is supported by an earlier rtinst release"
  exit
 fi
 
@@ -326,6 +325,11 @@ 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
+  cp /etc/apt/sources.list /etc/apt/sources.list.bak
+  cp -f /etc/rtinst/conf/sources1204 /etc/apt/sources.list
+fi
+
 echo "Updating package lists" | tee $logfile
 apt-get update 2>&1 >>$logfile | tee -a $logfile
 if ! [ $? = 0 ]; then
@@ -477,7 +481,19 @@ 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
-  apt-get -y install vsftpd >> $logfile 2>&1
+
+  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
+
 fi
 
 sed -i '/^\(\s\|#\)*anonymous_enable/ c\anonymous_enable=NO' /etc/vsftpd.conf
@@ -663,7 +679,9 @@ 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 [ "$phpver" = "php7.0" ]; then
+if [ $relno = 12 ]; then
+  echo "          fastcgi_pass 127.0.0.1:9000;" >> /etc/nginx/conf.d/php
+elif [ "$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

scripts/rtsslcert

@@ -48,6 +48,8 @@ echo -n "Generating https/ssl certificates"
 
 openssl req -x509 -nodes -days 3650 -subj /CN=$serverip -config /etc/ssl/ruweb.cnf -newkey rsa:2048 -keyout /etc/ssl/private/ruweb.key -out /etc/ssl/ruweb.crt > /dev/null 2>&1
 
+echo ": done"
+
 if [ -f /etc/vsftpd.conf ]; then
   sed -i '/^\(\s\|#\)*rsa_private_key_file/ c\rsa_private_key_file=\/etc\/ssl\/private\/ruweb\.key' /etc/vsftpd.conf
   sed -i '/^\(\s\|#\)*rsa_cert_file/ c\rsa_cert_file=\/etc\/ssl\/ruweb\.crt' /etc/vsftpd.conf
@@ -59,8 +61,6 @@ if [ -f /etc/nginx/sites-available/default ]; then
   sed -i '/ssl_certificate_key/ c\        ssl_certificate_key \/etc\/ssl\/private\/ruweb\.key;' /etc/nginx/sites-available/default
   service nginx restart
 fi
-
-echo ": done"
 }
 
 #check it is being run as root