From bdc1d996e8cb3123e4d6cec3712a443843b5b54d Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Tue, 30 Nov 2021 22:40:28 +0100 Subject: [PATCH] Updated Cache server ip (again) --- CT-Build/Alpine.yaml | 6 +++--- CT-Build/Debian.yaml | 4 ++-- Scripts/UpdateIMGBuildFile-CacheAndRepo.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml index 1516496..1d07934 100644 --- a/CT-Build/Alpine.yaml +++ b/CT-Build/Alpine.yaml @@ -7,7 +7,7 @@ source: same_as: 3.12 keyserver: keys.openpgp.org #InitDownloadREPO - url: http://192.168.200.20/alpine/ + url: http://192.168.200.3/alpine/ keys: # 0482D84022F52DF1C4E7CD43293ACD0907D9495A - |- @@ -550,8 +550,8 @@ packages: - name: /etc/apk/repositories url: |- #StartREPOS - http://192.168.200.20/alpine//v{{ image.release }}/main - http://192.168.200.20/alpine/v{{ image.release }}/community + http://192.168.200.3/alpine/v{{ image.release }}/main + http://192.168.200.3/alpine/v{{ image.release }}/community #EndREPOS {% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %} diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index d5df8d1..2fde6e4 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -5,7 +5,7 @@ image: source: downloader: debootstrap #InitDownloadREPO - url: http://192.168.200.20/deb.debian.org/debian + url: http://192.168.200.3/deb.debian.org/debian keyserver: keys.openpgp.org keys: # 0x126C0D24BD8A2942CC7DF8AC7638D0442B90D010 @@ -1350,7 +1350,7 @@ actions: echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/01Recommends echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/01Suggests #ProxyCacheSetting - echo 'Acquire::http::Proxy "http://192.168.200.20:80";' > /etc/apt/apt.conf.d/01prox + echo 'Acquire::http::Proxy "http://192.168.200.3:80";' > /etc/apt/apt.conf.d/01prox - trigger: post-packages action: |- #!/bin/sh diff --git a/Scripts/UpdateIMGBuildFile-CacheAndRepo.sh b/Scripts/UpdateIMGBuildFile-CacheAndRepo.sh index 7aea2f8..2cb2f79 100644 --- a/Scripts/UpdateIMGBuildFile-CacheAndRepo.sh +++ b/Scripts/UpdateIMGBuildFile-CacheAndRepo.sh @@ -6,9 +6,9 @@ ThisScriptConfigured=no UseCache=no #Cache enable (using apt-cacher-NG) -CacheAlpineRepo="http://192.168.200.20/alpine/" -CacheDebianCache="http://192.168.200.20:80" -CacheDebianCore="http://192.168.200.20/deb.debian.org/debian" +CacheAlpineRepo="http://192.168.200.3/alpine/" +CacheDebianCache="http://192.168.200.3:80" +CacheDebianCore="http://192.168.200.3/deb.debian.org/debian" #Cache enable (using Official MirrorServers) DefaultAlpineRepo="http://dl-4.alpinelinux.org/alpine/" @@ -53,7 +53,7 @@ sed -i -e '/#InitDownloadREPO/a \ url: '$AlpineRepo'' CT-Build/Alpine.yaml #AlpineRepo sed -i -n '/#StartREPOS/{:a;N;/#EndREPOS/!ba;N;s/.*\n/#HereREPO\n/};p' CT-Build/Alpine.yaml -sed -i -e 's#\#HereREPO#\ \#StartREPOS\n\ '$AlpineRepo'/v{{ image.release }}/main\n\ '$AlpineRepo'v{{ image.release }}/community\n\ \#EndREPOS#g' CT-Build/Alpine.yaml +sed -i -e 's#\#HereREPO#\ \#StartREPOS\n\ '$AlpineRepo'v{{ image.release }}/main\n\ '$AlpineRepo'v{{ image.release }}/community\n\ \#EndREPOS#g' CT-Build/Alpine.yaml #DebianBaseRepo sed -i -e '/#InitDownloadREPO/{n;d}' CT-Build/Debian.yaml