core73: Fix typo in proxy configuration converter.

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / 73 / update.sh

diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh
index 446e8a0ba0de91f5fc967667cd97823d6d97f928..ee799adb62f1cc9fea667943d6e57d11220b50c1 100644 (file)
--- a/config/rootfiles/core/73/update.sh
+++ b/config/rootfiles/core/73/update.sh
@@ -35,19 +35,37 @@ done
 
 #
 #Stop services
+/etc/init.d/squid stop
 
 
 #
 #Extract files
 extract_files
 
+if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then
+       (
+               eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
+
+               TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))"
+               echo "TRANSPARENT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings
+       )
+fi
+
+# Regenerate squid configuration files.
+/srv/web/ipfire/cgi-bin/proxy.cgi
 
 #
 #Start services
+/etc/init.d/squid start
 
 #
 #Update Language cache
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+# Remove invalid fetchmail symlinks when postfix is installed.
+if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then
+       rm -f /etc/rc.d/rc*.d/*fetchmail
+fi
 
 sync