Merge branch '12-fix-nix1-net3-telnet' into 'master'

Resolve "Nix1-Net3 Telnet service configuration + start fails"

Closes #12 and #13

See merge request CCTC/public!182

heat/networking/packages_and_scripts/net1.sh

@@ -4,9 +4,9 @@ echo 52.247.160.149 git.cybbh.space >> /etc/hosts
 sed -i's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
+apt-get -y upgrade
 pkg_array=({locate,netcat,dnsutils,lsof,ftp,telnet,wireshark,tcpdump,p0f,scapy,nmap,proxychains,pv,nginx,proftpd,gdebi,install,ethtool,git,make,gcc,flex,bison,build-essential,checkinstall,libpcap-dev,libnet1-dev,libpcre3-dev,libnetfilter-queue-dev,iptables-dev,libdumbnet-dev,zlib1g-dev})
 for x in ${pkg_array[@]}; do apt-get install -y $x; done
-apt-get upgrade
 cd /
 wget https://git.cybbh.space/CCTC/public/raw/master/heat/networking/packages_and_scripts/daq_2.0.6-1_amd64.deb
 wget https://git.cybbh.space/CCTC/public/raw/master/heat/networking/packages_and_scripts/snort_2.9.9.0-1_amd64.deb

heat/networking/packages_and_scripts/nix1_net3.sh

 #!/bin/bash            
 echo 127.0.0.1 $(hostname) >> /etc/hosts
 echo 52.247.160.149 git.cybbh.space >> /etc/hosts
-apt-get -y update
-pkg_array=({locate,dnsutils,lsof,aptitude,ftp,auditd,xinetd,telnetd,samba,git,zip,unzip,figlet,sshpass,hexedit,tree,apache2,gcc,tcc,build-essential,libreadline-dev,libssl-dev,libpq5,libpq-dev,libreadline5,libsqlite3-dev,libpcap-dev,git-core,autoconf,postgresql,pgadmin3,curl,zlib1g-dev,libxml2-dev,libxslt1-dev,libyaml-dev,nmap,python-setuptools,python-dev,hydra,hydra-gtk,john,xrdp,netcat,firefox,figlet,lolcat,ubuntu_desktop,linux-headers-($uname -r),nginx,proftpd,ethtool,ruby,ruby-dev,gem,bundler})
-for x in ${pkg_array[@]}; do apt-get build-dep $x; done
-for x in ${pkg_array[@]}; do apt-get install -y $x; done
-apt-get -y install qemu && apt-get -y install qemu
+apt-get update
 apt-get -y upgrade
+export DEBIAN_FRONTEND=noninteractive
+pkg_array=({locate,dnsutils,lsof,aptitude,ftp,auditd,xinetd,telnetd,samba,git,zip,unzip,figlet,sshpass,hexedit,tree,apache2,gcc,tcc,build-essential,libreadline-dev,libssl-dev,libpq5,libpq-dev,libreadline5,libsqlite3-dev,libpcap-dev,git-core,autoconf,postgresql,pgadmin3,curl,zlib1g-dev,libxml2-dev,libxslt1-dev,libyaml-dev,nmap,python-setuptools,python-dev,hydra,hydra-gtk,john,xrdp,netcat,firefox,figlet,lolcat,ubuntu_desktop,nginx,proftpd,ethtool,ruby,ruby-dev,gem,bundler,qemu})
+for x in ${pkg_array[@]}; do apt-get install -y ${x}; done
 gem install lolcat bundler
 updatedb
 mandb