summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2017-06-30 22:49:24 +0200
committerHolger Levsen <holger@layer-acht.org>2017-08-01 00:53:59 -0400
commit72d154f9bdb8d4792fa2bff0cccaad8bf2f8069a (patch)
tree80859caebcdd8953304e22f0e5d39fe91a0382bd /hosts/jenkins/etc
parent8d0a6d3fafa6e5f6e85cf3aeeb183f094d95fd0f (diff)
downloadjenkins.debian.net-72d154f9bdb8d4792fa2bff0cccaad8bf2f8069a.tar.xz
stretch upgrade: squid3 --> squid
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'hosts/jenkins/etc')
-rw-r--r--hosts/jenkins/etc/squid/squid.conf (renamed from hosts/jenkins/etc/squid3/squid.conf)48
1 files changed, 24 insertions, 24 deletions
diff --git a/hosts/jenkins/etc/squid3/squid.conf b/hosts/jenkins/etc/squid/squid.conf
index d3a0a7f1..34be0ec5 100644
--- a/hosts/jenkins/etc/squid3/squid.conf
+++ b/hosts/jenkins/etc/squid/squid.conf
@@ -130,7 +130,7 @@
# If you want to use the traditional NCSA proxy authentication, set
# this line to something like
#
-# auth_param basic program /usr/lib/squid3/ncsa_auth /usr/etc/passwd
+# auth_param basic program /usr/lib/squid/ncsa_auth /usr/etc/passwd
#
# "utf8" on|off
# HTTP uses iso-latin-1 as characterset, while some authentication
@@ -198,7 +198,7 @@
# If you want to use a digest authenticator, set this line to
# something like
#
-# auth_param digest program /usr/lib/squid3/digest_pw_auth /usr/etc/digpass
+# auth_param digest program /usr/lib/squid/digest_pw_auth /usr/etc/digpass
#
# "utf8" on|off
# HTTP uses iso-latin-1 as characterset, while some authentication
@@ -260,7 +260,7 @@
# of type proxy_auth. By default, the NTLM authenticator_program
# is not used.
#
-# auth_param ntlm program /usr/lib/squid3/ntlm_auth
+# auth_param ntlm program /usr/lib/squid/ntlm_auth
#
# "children" numberofchildren
# The number of authenticator processes to spawn (no default).
@@ -295,7 +295,7 @@
# The only supported program for this role is the ntlm_auth
# program distributed as part of Samba, version 4 or later.
#
-# auth_param negotiate program /usr/lib/squid3/ntlm_auth --helper-protocol=gss-spnego
+# auth_param negotiate program /usr/lib/squid/ntlm_auth --helper-protocol=gss-spnego
#
# "children" numberofchildren
# The number of authenticator processes to spawn (no default).
@@ -1603,11 +1603,11 @@ http_port 3128
# -DUSE_SSL_CRTD define
#
# Specify the location and options of the executable for ssl_crtd process.
-# /usr/lib/squid3/ssl_crtd program requires -s and -M parameters
+# /usr/lib/squid/ssl_crtd program requires -s and -M parameters
# For more information use:
-# /usr/lib/squid3/ssl_crtd -h
+# /usr/lib/squid/ssl_crtd -h
#Default:
-# sslcrtd_program /usr/lib/squid3/ssl_crtd -s /var/lib/ssl_db -M 4MB
+# sslcrtd_program /usr/lib/squid/ssl_crtd -s /var/lib/ssl_db -M 4MB
# TAG: sslcrtd_children
# Note: This option is only available if Squid is rebuilt with the
@@ -2229,8 +2229,8 @@ http_port 3128
#
# Uncomment and adjust the following to add a disk cache directory.
-#cache_dir ufs /var/spool/squid3 100 16 256
-cache_dir ufs /var/spool/squid3 16384 16 1024
+#cache_dir ufs /var/spool/squid 100 16 256
+cache_dir ufs /var/spool/squid 4096 16 1024
# TAG: store_dir_select_algorithm
# Set this to 'round-robin' as an alternative.
@@ -2451,9 +2451,9 @@ maximum_object_size 153600 KB
# err, warning, notice, info, debug.
#
# Default:
-# access_log /var/log/squid3/access.log squid
+# access_log /var/log/squid/access.log squid
#Default:
-# access_log /var/log/squid3/access.log squid
+# access_log /var/log/squid/access.log squid
# TAG: icap_log
# ICAP log files record ICAP transaction summaries, one line per
@@ -2557,7 +2557,7 @@ maximum_object_size 153600 KB
# disable it.
#
# Example:
-# cache_store_log /var/log/squid3/store.log
+# cache_store_log /var/log/squid/store.log
#Default:
# none
@@ -2636,7 +2636,7 @@ maximum_object_size 153600 KB
# this, but the default file contains examples and formatting
# information if you do.
#Default:
-# mime_table /usr/share/squid3/mime.conf
+# mime_table /usr/share/squid/mime.conf
# TAG: log_mime_hdrs on|off
# The Cache can record both the request and the response MIME
@@ -2672,7 +2672,7 @@ maximum_object_size 153600 KB
# TAG: pid_filename
# A filename to write the process-id to. To disable, enter "none".
#Default:
-# pid_filename /var/run/squid3.pid
+# pid_filename /var/run/squid.pid
# TAG: log_fqdn on|off
# Turn this on if you wish to log fully qualified domain names
@@ -2723,7 +2723,7 @@ maximum_object_size 153600 KB
# A filename where Squid stores it's netdb state between restarts.
# To disable, enter "none".
#Default:
-# netdb_filename /var/log/squid3/netdb.state
+# netdb_filename /var/log/squid/netdb.state
# OPTIONS FOR TROUBLESHOOTING
# -----------------------------------------------------------------------------
@@ -2733,7 +2733,7 @@ maximum_object_size 153600 KB
# your cache's behavior goes. You can increase the amount of data
# logged to this file and how often its rotated with "debug_options"
#Default:
-# cache_log /var/log/squid3/cache.log
+# cache_log /var/log/squid/cache.log
# TAG: debug_options
# Logging options are set as section,level where each source file
@@ -2762,7 +2762,7 @@ maximum_object_size 153600 KB
#
# Leave coredumps in the first cache dir
-coredump_dir /var/spool/squid3
+coredump_dir /var/spool/squid
# OPTIONS FOR FTP GATEWAYING
# -----------------------------------------------------------------------------
@@ -2881,12 +2881,12 @@ coredump_dir /var/spool/squid3
# Note this is only useful if you have compiled in
# diskd as one of the store io modules.
#Default:
-# diskd_program /usr/lib/squid3/diskd
+# diskd_program /usr/lib/squid/diskd
# TAG: unlinkd_program
# Specify the location of the executable for file deletion process.
#Default:
-# unlinkd_program /usr/lib/squid3/unlinkd
+# unlinkd_program /usr/lib/squid/unlinkd
# TAG: pinger_program
# Note: This option is only available if Squid is rebuilt with the
@@ -2894,7 +2894,7 @@ coredump_dir /var/spool/squid3
#
# Specify the location of the executable for the pinger process.
#Default:
-# pinger_program /usr/lib/squid3/pinger
+# pinger_program /usr/lib/squid/pinger
# TAG: pinger_enable
# Note: This option is only available if Squid is rebuilt with the
@@ -4572,9 +4572,9 @@ refresh_pattern . 0 20% 4320
# TAG: icon_directory
# Where the icons are stored. These are normally kept in
-# /usr/share/squid3/icons
+# /usr/share/squid/icons
#Default:
-# icon_directory /usr/share/squid3/icons
+# icon_directory /usr/share/squid/icons
# TAG: global_internal_static
# This directive controls is Squid should intercept all requests for
@@ -4649,7 +4649,7 @@ refresh_pattern . 0 20% 4320
#
# For information on CSS see http://www.w3.org/Style/CSS/
#Default:
-# err_page_stylesheet /etc/squid3/errorpage.css
+# err_page_stylesheet /etc/squid/errorpage.css
# TAG: err_html_text
# HTML text to include in error messages. Make this a "mailto"
@@ -5338,7 +5338,7 @@ refresh_pattern . 0 20% 4320
#
# Specify the location of the executable for dnslookup process.
#Default:
-# cache_dns_program /usr/lib/squid3/dnsserver
+# cache_dns_program /usr/lib/squid/dnsserver
# TAG: dns_children
# Note: This option is only available if Squid is rebuilt with the