Просмотр исходного кода

* debian/apt.cron.daily:
- use admin user proxy settings

Michael Vogt лет назад: 18
Родитель
Сommit
1fdd4ac46f
2 измененных файлов с 17 добавлено и 0 удалено
  1. 10 0
      debian/apt.cron.daily
  2. 7 0
      debian/changelog

+ 10 - 0
debian/apt.cron.daily

@@ -179,6 +179,16 @@ if ! apt-get check -q -q 2>/dev/null; then
     exit 1
 fi
 
+# set the proxy based on the admin users gconf settings
+admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
+if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then
+	use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy)
+	host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host)
+	port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port)
+	if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
+		export http_proxy="http://$host:$port/"
+	fi
+fi
 
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then

+ 7 - 0
debian/changelog

@@ -1,3 +1,10 @@
+apt (0.7.9ubuntu11) hardy; urgency=low
+
+  * debian/apt.cron.daily:
+    - use admin user proxy settings
+
+ --
+
 apt (0.7.9ubuntu10) hardy; urgency=low
 
   * cmdline/apt-key: