Update rtupdate

* Update rtinst

* Update rtinst

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtsslcert

* Update rtinst

* Update rtupdate

conf/rtorrent.rc

@@ -8,7 +8,7 @@ method.insert = cfg.basedir,     private|const|string, (cat,"<user home>/rtorren
 method.insert = cfg.watch,       private|const|string, (cat,(cfg.basedir),"watch/")
 
 #method.insert = cfg.logs,       private|const|string, (cat,(cfg.basedir),"log/")
-#method.insert = cfg.logfile,    private|const|string, (cat,(c   fg.logs),"rtorrent-",(system.time),".log")
+#method.insert = cfg.logfile,    private|const|string, (cat,(cfg.logs),"rtorrent-",(system.time),".log")
 
 session.path.set = (cat,(cfg.basedir),".session")
 directory.default.set = (cat,(cfg.basedir),"download")

conf/ru.config

@@ -43,6 +43,7 @@ $pathToExternals = array(
 "gzip" => '/bin/gzip', // Something like /usr/bin/gzip. If empty, will be found in PATH.
 "id" => '/usr/bin/id', // Something like /usr/bin/id. If empty, will be found in PATH.
 "stat" => '/usr/bin/stat', // Something like /usr/bin/stat. If empty, will be found in PATH.
+"pgrep" => '/usr/bin/pgrep', // Something like /usr/bin/pgrep. If empty, will be found in PATH.
 );
 
 $localhosts = array( // list of local interfaces

conf/ru.ini

@@ -100,6 +100,8 @@ enabled = yes
 enabled = yes
 
 ;; Disabled
+[_cloudflare]
+enabled = no
 [check_port]
 enabled = no
 [chunks]
@@ -120,5 +122,7 @@ enabled = no
 enabled = no
 [scheduler]
 enabled = no
+[spectrogram]
+enabled = no
 [xmpp]
 enabled = no

rtsetup

@@ -31,6 +31,20 @@ if [ "$(id -u)" != "0" ]; then
   exit 1
 fi
 
+# kill apt-daily.service if running 
+if [[ $(systemctl list-units --all apt-daily.service | fgrep -c apt-daily.service) -gt 0 ]]; then
+  systemctl stop apt-daily.service > /dev/null 2>&1
+  systemctl kill --kill-who=all apt-daily.service > /dev/null 2>&1
+
+# wait until `apt-get updated` has been killed
+  while ! (systemctl list-units --all apt-daily.service | fgrep -q dead)
+    do
+      sleep 1;
+    done
+fi
+
+apt-get -qq update
+
 if [ $(dpkg-query -W -f='${Status}' git 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
 echo "Installing git"
 apt-get -yqq install git 2>&1 >> /dev/null

scripts/rtadmin

@@ -49,7 +49,7 @@ echo "Select from the following options:"
 echo "1.) rtsetup - update the rtinst scripts"
 echo "2.) rtadduser - add new user"
 echo "3.) rtremove - delete a user"
-echo "4.) rtdload $rtdaction - $rtdaction http downloads"
+echo "4.) rtdload $rtdaction - $rtdaction https downloads"
 echo "5.) rtupdate - up/down-grade rtorent/libtorrent"
 echo "6.) rutupgrade - upgrade to latest version of RuTorrent"
 echo "7.) rtwebmin - install webmin"

scripts/rtinst

@@ -20,7 +20,7 @@ rtorrentrel=''
 #url's of the major components
 rt_url="http://rtorrent.net/downloads/"
 
-xmlrpc_url="https://svn.code.sf.net/p/xmlrpc-c/code/stable/"
+xmlrpc_url="https://svn.code.sf.net/p/xmlrpc-c/code/advanced/"
 xmlrpc_url_alt="https://github.com/mirror/xmlrpc-c"
 
 ru_url="https://github.com/Novik/ruTorrent/"
@@ -59,7 +59,29 @@ if [ "$relno" = "18" ]; then
   libcver=libcurl4
 fi
 
-export serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
+serveripb=$(wget -qO- ipecho.net/plain)
+
+if [ "$serveripa" = "$serveripb" ]; then
+  export serverip=$serveripa
+else
+  echo "Select the IP address to use:"
+  echo "1.) "$serveripa
+  echo "2.) "$serveripb
+
+  while true
+    do
+      read answer
+      case $answer in [1] ) export serverip=$serveripa && break ;;
+                      [2] ) export serverip=$serveripb && break ;;
+                        * ) echo "Enter 1 or 2";;
+    esac
+  done
+fi
+
+echo "IP set to "$serverip
+
+
 export logfile="/dev/null"
 webpass=''
 cronline1="@reboot sleep 10; /usr/local/bin/rtcheck irssi rtorrent"
@@ -72,7 +94,7 @@ sshport=''
 rudevflag=1
 rurelease=master
 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 $libcver 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 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"
+package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl cfv dtach htop irssi libcloog-ppl-dev libcppunit-dev $libcver 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-xmlrpc python-scgi screen subversion texinfo unzip zlib1g-dev libcurl4-openssl-dev mediainfo 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=""
 unixpass=""
 passflag=0
@@ -449,6 +471,19 @@ echo "No more user input required, you can complete unattended"
 echo "It will take approx 10 minutes for the script to complete"
 echo
 
+# kill apt-daily.service if running 
+if [[ $(systemctl list-units --all apt-daily.service | fgrep -c apt-daily.service) -gt 0 ]]; then
+  systemctl stop apt-daily.service >> $logfile 2>&1
+  systemctl kill --kill-who=all apt-daily.service >> $logfile 2>&1
+
+# wait until `apt-get updated` has been killed
+  while ! (systemctl list-units --all apt-daily.service | fgrep -q dead)
+    do
+      sleep 1;
+    done
+
+fi
+
 #update amd upgrade system
 echo "Updating package lists" | tee $logfile
 apt-get -qq update | tee -a $logfile

scripts/rtsslcert

@@ -8,7 +8,6 @@
 #
 #########################################################################################
 
-
 forceyes=1
 headless=1
 selfsign=1
@@ -95,11 +94,27 @@ if [ $# -gt 0 ]; then
 fi
 
 if [ -z $serverip ]; then
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+  serveripa=$(ip route get 8.8.8.8 | awk 'NR==1 {print $7}')
-elif ! valid_ip $serverip; then
+  serveripb=$(wget -qO- ipecho.net/plain)
-  echo "$serverip is not a valid IP address"
+  if [ "$serveripa" = "$serveripb" ]; then
-  serverip=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
+    serverip=$serveripa
-  echo "will use $serverip instead"
+  else
+    echo "Select the IP address to use:"
+    echo "1.) "$serveripa
+    echo "2.) "$serveripb
+
+    while true
+      do
+        read answer
+        case $answer in [1] ) serverip=$serveripa && break ;;
+                        [2] ) serverip=$serveripb && break ;;
+                          * ) echo "Enter 1 or 2";;
+      esac
+    done
+  fi
+
+  echo "IP set to "$serverip
+  echo
 fi
 
 serverdn=$(perl -MSocket -le "print((gethostbyaddr(inet_aton('$serverip'), AF_INET))[0])")

scripts/rtupdate

@@ -14,11 +14,11 @@ osname=$(lsb_release -si)
 relno=$(lsb_release -sr | cut -d. -f1)
 sourcedir='http://rtorrent.net/downloads/'
 
-xmlrpc_url='https://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+xmlrpc_url='https://svn.code.sf.net/p/xmlrpc-c/code/advanced/'
-xmlrpcloc='svn://svn.code.sf.net/p/xmlrpc-c/code/stable/'
+xmlrpcloc='svn://svn.code.sf.net/p/xmlrpc-c/code/advanced/'
 
 xmlrpc_url_alt='https://github.com/mirror/xmlrpc-c'
-xmlrpcloc_alt='https://github.com/mirror/xmlrpc-c/trunk/stable'
+xmlrpcloc_alt='https://github.com/mirror/xmlrpc-c/trunk/advanced'
 
 rtdevrel=1
 
@@ -137,11 +137,11 @@ if [ -z $passed_rtvers ]; then
     exit 1
   fi
 
-# checks if the OS is debian 9, and forces the version to 0.9.6 of it is
+# checks if the OS is debian 9, and forces the version to 0.9.7 of it is
   if [ $rtdevrel = 0 ]; then
-    libvers='0.13.6'
+    libvers='0.13.7'
-    rtvers='0.9.6'
+    rtvers='0.9.7'
-    echo "Debian 9 and Ubuntu 17.10 are only supported by libtorrent-0.13.6/rtorrent-0.9.6"
+    echo "Debian 9, and Ubuntu 17.10 and later, are only supported by libtorrent-0.13.7/rtorrent-0.9.7"
   else
     list_version
   fi
@@ -164,11 +164,11 @@ else
     rtvers=$passed_rtvers
   fi
 
-  # checks if the OS is debian 9, and forces the version to 0.9.6 of it is
+  # checks if the OS is debian 9, and forces the version to 0.9.7 of it is
   if [ $rtdevrel = 0 ]; then
-    libvers='0.13.6'
+    libvers='0.13.7'
-    rtvers='0.9.6'
+    rtvers='0.9.7'
-    echo "Debian 9 and Ubuntu 17.10 are only supported by libtorrent-0.13.6/rtorrent-0.9.6"
+    echo "Debian 9, and Ubuntu 17.10 and later, are only supported by libtorrent-0.13.7/rtorrent-0.9.7"
   fi
 
 fi