Changeset 5508 for squid-ssl/trunk/fuentes

Timestamp:

Jul 13, 2017, 12:53:36 PM (4 years ago)

Author:

Juanma

Message:

Initial release

Location:

squid-ssl/trunk/fuentes/debian

Files:

• squid-ssl-common.postinst (modified) (1 diff)
• squid-ssl.postinst (modified) (2 diffs)

squid-ssl/trunk/fuentes/debian/squid-ssl-common.postinst

@@ -12 +12 @@
                 if [ -d /usr/share/squid-langpack ]
                 then
+                        rm /usr/share/squid-ssl/errors 2>/dev/null
                         ln -s /usr/share/squid-langpack /usr/share/squid-ssl/errors
                 fi

squid-ssl/trunk/fuentes/debian/squid-ssl.postinst

@@ -2 +2 @@
 
 set -e
+
+grepconf () {
+        w="     " # space tab
+        # sed is cool.
+        res=`squid -k parse 2>&1 |
+                grep "Processing:" |
+                sed s/.*Processing:\ // |
+                sed -ne '
+                        s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                        t end;
+                        d;
+                        :end q'`
+        [ -n "$res" ] || res=$2
+        echo "$res"
+}
+
+grepconf2 () {
+        w="     " # space tab
+        # sed is cool.
+        res=`squid -k parse 2>&1 |
+                grep "Processing:" |
+                sed s/.*Processing:\ // |
+                sed -ne '
+                        s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                        t end;
+                        d;
+                        :end q'`
+        [ -n "$res" ] || res=$2
+        echo "$res"
+}
 
 case "$1" in
@@ -9 +39 @@
                 #
                 log_dir=/var/log/squid-ssl
-                cache_dir=`grepconf cache_dir /var/spool/squid-ssl`
+                cache_dir=`grepconf2 cache_dir /var/spool/squid-ssl`
                 usr=`grepconf cache_effective_user proxy`
                 grp=`grepconf cache_effective_group proxy`