[debian-edu-commits] [Git][debian-edu/debian-edu-config][rclobus/apt_proxy] 2 commits: libexec/debian-edu-apache2-update-tjener-aliases: Only execute on host...
Mike Gabriel (@sunweaver)
gitlab at salsa.debian.org
Mon Nov 9 12:03:52 GMT 2026
Mike Gabriel pushed to branch rclobus/apt_proxy at Debian Edu / debian-edu-config
Commits:
8bca3c00 by Mike Gabriel at 2026-11-09T10:52:33+01:00
libexec/debian-edu-apache2-update-tjener-aliases: Only execute on host 'tjener', only if 'root'. (Closes: #1153506).
- - - - -
0b25f963 by Roland Clobus at 2026-11-09T12:03:50+00:00
Use the proxy to speed up tests in a VM (Closes: #1153509)
- - - - -
2 changed files:
- libexec/debian-edu-apache2-update-tjener-aliases
- sbin/debian-edu-ltsp-install
Changes:
=====================================
libexec/debian-edu-apache2-update-tjener-aliases
=====================================
@@ -14,6 +14,19 @@
set -euo pipefail
+# -----------------------------------------------------------------------------
+# Only run on tjener and only as root
+# -----------------------------------------------------------------------------
+if [ "$(whoami)" != "root" ] ; then
+ echo "ERROR: $(basename $0) needs to be run as 'root', aborting..."
+ exit 1
+fi
+
+if [ "$(hostname -s)" != "tjener" ]; then
+ # silently exit, nothing to be done if not on tjener
+ exit 0
+fi
+
# -----------------------------------------------------------------------------
# Configuration
# -----------------------------------------------------------------------------
=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -134,6 +134,17 @@ img="yes"
desktop="xfce"
x2go_desktop="$(select_desktop)"
+# If apt was configured to use a proxy (e.g. in a VM), use it here too
+if [ -z "$http_proxy" ]; then
+ eval $(apt-config shell http_proxy Acquire::http::Proxy)
+fi
+if [ -z "$https_proxy" ]; then
+ eval $(apt-config shell https_proxy Acquire::https::Proxy)
+fi
+if [ -z "$ftp_proxy" ]; then
+ eval $(apt-config shell ftp_proxy Acquire::ftp::Proxy)
+fi
+
while [ $# -gt 0 ] ; do
case "$1" in
--arch) arch="$2" ; shift ;;
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/4396fa099eca70010b909e21181c7e625826e797...0b25f96372b622b2b2385f64e699ba24bb99f5f7
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/4396fa099eca70010b909e21181c7e625826e797...0b25f96372b622b2b2385f64e699ba24bb99f5f7
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20261109/bc717198/attachment-0001.htm>
More information about the debian-edu-commits
mailing list