aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2017-06-15 13:02:47 +0800
committerAaron LI <aly@aaronly.me>2017-06-15 13:02:47 +0800
commit2a9dc352f9d0caac4a28c05cc801a004182e960e (patch)
tree0a90efffccc8532df3d42e6f7357b4e7ec9c2875
parent147a93b2f08d1bb62ca6946a8ddff2974e418401 (diff)
downloaddebian-hpc-2a9dc352f9d0caac4a28c05cc801a004182e960e.tar.bz2
Use the same mirror for security updates
-rw-r--r--group_vars/master4
-rw-r--r--roles/netinstall/templates/debian.preseed.cfg.j22
2 files changed, 2 insertions, 4 deletions
diff --git a/group_vars/master b/group_vars/master
index d5084e5..fae6302 100644
--- a/group_vars/master
+++ b/group_vars/master
@@ -29,9 +29,7 @@ lan_netmask: 255.255.255.0
tftp_root: /srv/tftp
-# Mirror from where to install packages
+# Mirror from where to install packages (HTTP), and security updates.
apt_mirror: ftp.sjtu.edu.cn
-# Source for the security updates
-apt_security_host: ftp.sjtu.edu.cn
# vim: set ft=yaml sw=2:
diff --git a/roles/netinstall/templates/debian.preseed.cfg.j2 b/roles/netinstall/templates/debian.preseed.cfg.j2
index c01f4e9..30c3e53 100644
--- a/roles/netinstall/templates/debian.preseed.cfg.j2
+++ b/roles/netinstall/templates/debian.preseed.cfg.j2
@@ -311,7 +311,7 @@ d-i apt-setup/contrib boolean true
# Values shown below are the normal defaults.
d-i apt-setup/services-select multiselect security, updates
#d-i apt-setup/security_host string security.debian.org
-d-i apt-setup/security_host string {{ apt_security_host }}
+d-i apt-setup/security_host string {{ apt_mirror }}
# Additional repositories, local[0-9] available
#d-i apt-setup/local0/repository string \