From 508d01d4e7520df97e037fd9c6b7892294e955e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Tue, 31 Jan 2017 11:01:51 +0100
Subject: [PATCH] Moved APT proxy config to correct file.
---
1.Utilities/0_setup.py | 2 +-
23.Initialize_environment/0_setup.sh | 4 ++--
24.Initialize_APT/0_setup.sh | 17 +++++++++++---
24.Initialize_APT/sources16.list | 33 +++++++++++-----------------
51.Install_CM/0_setup.sh | 11 ----------
73.Install_ferm/0_setup.sh | 2 +-
81.Install_MV/0_setup.sh | 2 +-
7 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/1.Utilities/0_setup.py b/1.Utilities/0_setup.py
index 5ec72cc9..86921deb 100644
--- a/1.Utilities/0_setup.py
+++ b/1.Utilities/0_setup.py
@@ -9,7 +9,7 @@ def setup(interactive=True):
cmds = [
'apt-get clean',
'apt-get update',
- 'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils ntp nfs-client smartmontools pwgen ntpdate dialog',
+ 'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils ntp nfs-client smartmontools pwgen ntpdate dialog curl',
'[ -f ~/.vimrc ] || echo "color ron" > ~/.vimrc',
]
utils.run_commands(cmds)
diff --git a/23.Initialize_environment/0_setup.sh b/23.Initialize_environment/0_setup.sh
index 49dcae0d..a8cc0659 100755
--- a/23.Initialize_environment/0_setup.sh
+++ b/23.Initialize_environment/0_setup.sh
@@ -30,7 +30,7 @@ fi
# DELL server - install dell openmanage
if ( ! dpkg -l | grep dmidecode )
then
-aptitude install -y dmidecode
+apt-get install -y dmidecode
fi
dmidecode > /tmp/dmidecode
@@ -41,7 +41,7 @@ echo 'deb http://linux.dell.com/repo/community/ubuntu xenial openmanage' | sudo
gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F
gpg -a --export 1285491434D8786F | sudo apt-key add -
-aptitude update && aptitude install -y srvadmin-all
+apt-get update && apt-get install -y srvadmin-all
update-rc.d dsm_om_connsvc defaults
echo "@reboot root /usr/sbin/service dsm_om_connsvc start" > /etc/cron.d/dell_openmanage
diff --git a/24.Initialize_APT/0_setup.sh b/24.Initialize_APT/0_setup.sh
index 76b973a0..f3b8e286 100755
--- a/24.Initialize_APT/0_setup.sh
+++ b/24.Initialize_APT/0_setup.sh
@@ -18,8 +18,7 @@ fi
# update
apt-get update
-apt-get install -y aptitude apt-transport-https
-#apt-get dist-upgrade -y
+apt-get install -y apt-transport-https
# modify sources.list to use ubicast cache
if ( ! test -z ${APT_CACHE_HOST} ); then
@@ -34,9 +33,21 @@ if ( ! test -z ${SKYREACH_API_KEY} ); then
echo "Adding skyreach.list to APT sources."
wget -q "https://${SKYREACH_HOST}/media/public.gpg" -O- | sudo apt-key add -
echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
- apt-get update
fi
+# APT proxy
+if [ ${PROXY} = "1" ]; then
+ if [ ${PROXY_AUTHENTICATION} = "1" ]; then
+ # general settings
+ echo "Proxy: http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
+ else
+ # general settings
+ echo "Proxy: http://${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
+ fi
+fi
+
+apt-get update
+
# unattended-upgrades
echo "Installing and configuring unattended-upgrades."
apt-get install -y unattended-upgrades
diff --git a/24.Initialize_APT/sources16.list b/24.Initialize_APT/sources16.list
index bf4a8aa9..aaa9ba29 100644
--- a/24.Initialize_APT/sources16.list
+++ b/24.Initialize_APT/sources16.list
@@ -1,20 +1,20 @@
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://fr.archive.ubuntu.com/ubuntu/ xenial main restricted
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial main restricted
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-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://fr.archive.ubuntu.com/ubuntu/ xenial universe
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial universe
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial universe
deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates universe
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates universe
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-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
@@ -22,9 +22,9 @@ deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates universe
## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team.
deb http://fr.archive.ubuntu.com/ubuntu/ xenial multiverse
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial multiverse
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial multiverse
deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-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
@@ -32,14 +32,7 @@ deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
deb http://fr.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
-deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
-
-deb http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb http://security.ubuntu.com/ubuntu xenial-security universe
-deb-src http://security.ubuntu.com/ubuntu xenial-security universe
-deb http://security.ubuntu.com/ubuntu xenial-security multiverse
-deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
+# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
@@ -48,9 +41,9 @@ deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
# deb http://archive.canonical.com/ubuntu xenial partner
# deb-src http://archive.canonical.com/ubuntu xenial 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 xenial main
-# deb-src http://extras.ubuntu.com/ubuntu xenial main
+deb http://security.ubuntu.com/ubuntu xenial-security main restricted
+# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
+deb http://security.ubuntu.com/ubuntu xenial-security universe
+# deb-src http://security.ubuntu.com/ubuntu xenial-security universe
+deb http://security.ubuntu.com/ubuntu xenial-security multiverse
+# deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
diff --git a/51.Install_CM/0_setup.sh b/51.Install_CM/0_setup.sh
index d5023c03..548c5e76 100755
--- a/51.Install_CM/0_setup.sh
+++ b/51.Install_CM/0_setup.sh
@@ -16,17 +16,6 @@ if ( ! rgrep 'AdminAuth: admin:' /etc/apt-cacher-ng/security.conf >/dev/null );
service apt-cacher-ng restart
fi
-# proxy
-if [ ${PROXY} = "1" ]; then
- if [ ${PROXY_AUTHENTICATION} = "1" ]; then
- # general settings
- echo "Proxy: http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
- else
- # general settings
- echo "Proxy: http://${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
- fi
-fi
-
# iptables rules for port 3142
DEBIAN_FRONTEND=noninteractive apt-get install -y iptables-persistent
iptables -A INPUT -p tcp -s localhost --destination-port 3142 -j ACCEPT
diff --git a/73.Install_ferm/0_setup.sh b/73.Install_ferm/0_setup.sh
index 1cc236dc..1de2ce98 100755
--- a/73.Install_ferm/0_setup.sh
+++ b/73.Install_ferm/0_setup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
source /root/envsetup/conf.sh
-DEBIAN_FRONTEND=noninteractive aptitude install -y ferm
+DEBIAN_FRONTEND=noninteractive apt-get install -y ferm
cp ferm.conf /etc/ferm/ferm.conf
service ferm restart
diff --git a/81.Install_MV/0_setup.sh b/81.Install_MV/0_setup.sh
index 1ab9da8b..89f429f7 100755
--- a/81.Install_MV/0_setup.sh
+++ b/81.Install_MV/0_setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
source /root/envsetup/conf.sh
-aptitude install -y dialog
+apt-get install -y dialog
cd /root
git clone https://git.ubicast.net/mediaserver/burp-custom.git &&
mv burp-custom/* /root/
--
GitLab