mirror needs to dynamic according to geo location

This commit is contained in:
t3chn0m4g3 2019-04-01 12:19:06 +00:00
parent ade98060d8
commit 8c6aacf1f5
3 changed files with 18 additions and 13 deletions

View file

@ -13,8 +13,8 @@ myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml"
myLSB_STABLE_SUPPORTED="stretch" myLSB_STABLE_SUPPORTED="stretch"
myLSB_TESTING_SUPPORTED="sid" myLSB_TESTING_SUPPORTED="sid"
myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org"
myPREINSTALLPACKAGES="apache2-utils curl dialog figlet grc libcrack2 libpq-dev lsb-release net-tools software-properties-common toilet" myPREINSTALLPACKAGES="apache2-utils curl dialog figlet grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet"
myINSTALLPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant" myINSTALLPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant"
myINFO="\ myINFO="\
######################################## ########################################
### T-Pot Installer for Debian (Sid) ### ### T-Pot Installer for Debian (Sid) ###
@ -263,11 +263,16 @@ function fuCHECKNET {
# Install T-Pot dependencies # Install T-Pot dependencies
function fuGET_DEPS { function fuGET_DEPS {
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
# Point to Debian (Sid, unstable) # Determine fastest mirror
tee /etc/apt/sources.list <<EOF echo
deb http://deb.debian.org/debian unstable main contrib non-free echo "### Determine fastest mirror for your location."
deb-src http://deb.debian.org/debian unstable main contrib non-free echo
EOF netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/
# # Point to Debian (Sid, unstable)
# tee /etc/apt/sources.list <<EOF
#deb http://deb.debian.org/debian unstable main contrib non-free
#deb-src http://deb.debian.org/debian unstable main contrib non-free
#EOF
echo echo
echo "### Getting update information." echo "### Getting update information."
echo echo

View file

@ -70,10 +70,10 @@ d-i user-setup/encrypt-home boolean false
######################################## ########################################
### Country Mirror & Proxy Configuration ### Country Mirror & Proxy Configuration
######################################## ########################################
d-i mirror/country string manual #d-i mirror/country string manual
d-i mirror/http/hostname string deb.debian.org #d-i mirror/http/hostname string deb.debian.org
d-i mirror/http/directory string /debian #d-i mirror/http/directory string /debian
d-i mirror/http/proxy string #d-i mirror/http/proxy string
################### ###################
# Suite to install # Suite to install
@ -109,7 +109,7 @@ tasksel tasksel/first multiselect ssh-server
######################## ########################
### Package Installation ### Package Installation
######################## ########################
d-i pkgsel/include string apache2-utils curl dialog figlet git grc libcrack2 libpq-dev lsb-release net-tools software-properties-common toilet d-i pkgsel/include string apache2-utils curl dialog figlet git grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet
popularity-contest popularity-contest/participate boolean false popularity-contest popularity-contest/participate boolean false
################# #################

View file

@ -169,7 +169,7 @@ echo
function fuUPDATER () { function fuUPDATER () {
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant" local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant"
echo "### Now upgrading packages ..." echo "### Now upgrading packages ..."
dpkg --configure -a dpkg --configure -a
apt-get -y autoclean apt-get -y autoclean