From b14d15302dbf8494af4fec5949f789bc51382e95 Mon Sep 17 00:00:00 2001 From: Bruno TATU Date: Wed, 9 May 2018 15:52:26 +0200 Subject: [PATCH] Revert "Whiteliste de domaines par defaut pour squid" This reverts commit e9afd493730158d68475d5c6d7fc8388ff919164. --- squid/files/evolinux-whitelist-defaults.conf | 45 ++++++------------ squid/files/whitelist-evolinux.conf | 50 +++++++------------- 2 files changed, 31 insertions(+), 64 deletions(-) diff --git a/squid/files/evolinux-whitelist-defaults.conf b/squid/files/evolinux-whitelist-defaults.conf index e4dc240d..125eda7d 100644 --- a/squid/files/evolinux-whitelist-defaults.conf +++ b/squid/files/evolinux-whitelist-defaults.conf @@ -5,9 +5,9 @@ ^backports\.debian\.org$ ^www\.kernel\.org$ ^hwraid\.le-vert\.net$ -^.*\.clamav\.net$ +^.*clamav\.net$ ^spamassassin\.apache\.org$ -^.*\.sa-update.*$ +^.*sa-update.*$ ^pear\.php\.net$ ^repo\.mysql\.com$ @@ -18,15 +18,12 @@ ^ocsp\.usertrust\.com$ ### CMS / Wordpress / Drupal / ... - # Wordpress -^.*\.akismet\.com$ -^.*\.wordpress\.(org|com)$ -^.*\.gravatar\.com$ +^.*akismet\.com$ +^.*wordpress\.(org|com)$ +^.*gravatar\.com$ ^www\.wordpress-fr\.net$ ^pixel\.wp\.com$ -^wp-updates\.com$ - # Wordpress pingback ^rpc\.pingomatic\.com$ ^blo\.gs$ @@ -56,13 +53,12 @@ ^geourl\.org$ ^ipings\.com$ ^www\.weblogalot\.com$ - # Wordpress plugins -^.*\.wpml\.org$ +^.*wpml\.org$ ^www\.wpcube\.co\.uk$ -^.*\.wp-rocket\.me$ +^.*wp-rocket\.me$ ^www\.yithemes\.com$ -^.*\.yoast\.com$ +^.*yoast\.com$ ^yarpp\.org$ ^repository\.kreaturamedia\.com$ ^api\.wp-events-plugin\.com$ @@ -73,27 +69,21 @@ ^vimeo\.com$ ^api\.genesistheme\.com$ ^www\.bolderelements\.net$ -^wpbakery\.com$ -^backwpup\.com$ - # Magento Plugins ^extensions\.activo\.com$ ^amasty\.com$ - # Joomla -^.*\.joomla\.org$ +^.*.joomla\.org$ ^getk2\.org$ ^miwisoft\.com$ ^mijosoft\.com$ ^www\.joomlaworks\.net$ ^cdn\.joomlaworks\.org$ ^download\.regularlabs\.com$ - # Prestashop -^.*\.prestashop\.com$ +^.*.prestashop\.com$ ^www\.presta-module\.com$ ^www\.presteamshop\.com$ - # Others ^.*.drupal\.org$ ^.*\.dotclear\.(net|org)$ @@ -102,9 +92,7 @@ ^www\.spip\.net$ ### Feeds / API / WS Tools / ... - # Google - ^.*\.googleapis\.com$ ^.*\.google-analytics\.com$ ^blogsearch\.google\.(com|fr)$ @@ -112,19 +100,16 @@ ^maps\.google\..*$ ^translate\.google\.com$ ^www\.google\.com$ - # Facebook ^.*\.facebook\.com$ ^.*\.fbcdn\.net$ - # Maxmind ^geolite\.maxmind\.com$ - # Others -#^.*\.amazon.com$ -^.*\.twitter\.com$ -^.*\.feedburner\.com$ -^.*\.openx\.(org|com|net)$ +#^.*amazon.com$ +^.*twitter\.com$ +^.*feedburner\.com$ +^.*openx\.(org|com|net)$ ^geoip-api\.meteor\.com$ ^www\.bing\.com$ ^www\.telize\.com$ @@ -140,5 +125,3 @@ ^jenkins\.mirror\.isppower\.de$ ^ftp\.icm\.edu\.pl$ ^apt\.newrelic\.com$ -^.*\.cloudfront\.net$ -^api\.mailjet\.com$ diff --git a/squid/files/whitelist-evolinux.conf b/squid/files/whitelist-evolinux.conf index bd3f33e0..5c22f4a7 100644 --- a/squid/files/whitelist-evolinux.conf +++ b/squid/files/whitelist-evolinux.conf @@ -1,13 +1,13 @@ ### Evolix & System -http://.*.evolix.(net|org|com|fr)/.* -http://.*.debian.org/.* +http://.*evolix.(net|org|com|fr)/.* +http://.*debian.org/.* http://www.backports.org/.* http://backports.debian.org/.* http://www.kernel.org/.* http://hwraid.le-vert.net/.* -http://.*.clamav.net/.* +http://.*clamav.net/.* http://spamassassin.apache.org/.* -http://.*.sa-update.* +http://.*sa-update.* http://pear.php.net/.* http://repo.mysql.com/.* @@ -18,15 +18,12 @@ http://.*.letsencrypt.org/.* http://ocsp.usertrust.com/.* ### CMS / Wordpress / Drupal / ... - # Wordpress -http://.*.akismet.com/.* -http://.*.wordpress.(org|com)/.* -http://.*.gravatar.com/.* +http://.*akismet.com/.* +http://.*wordpress.(org|com)/.* +http://.*gravatar.com/.* http://www.wordpress-fr.net/.* http://pixel.wp.com/.* -http://wp-updates.com/.* - # Wordpress pingback http://rpc.pingomatic.com/.* http://blo.gs/ping.php @@ -56,13 +53,12 @@ http://www.pingmyblog.com/.* http://geourl.org/ping http://ipings.com/.* http://www.weblogalot.com/ping - # Wordpress plugins -http://.*.wpml.org/.* +http://.*wpml.org/.* http://www.wpcube.co.uk/.* -http://.*.wp-rocket.me/.* +http://.*wp-rocket.me/.* http://www.yithemes.com/.* -http://.*.yoast.com/.* +http://.*yoast.com/.* http://yarpp.org/.* http://repository.kreaturamedia.com/.* http://api.wp-events-plugin.com/.* @@ -70,16 +66,12 @@ http://updates.themepunch.com/.* http://themeisle.com/.* http://download.advancedcustomfields.com/.* http://wpcdn.io/.* -http://vimeo.com/.* +http://vimeo.com/channels/wpetourisme/videos/rss http://api.genesistheme.com/update-themes/ http://www.bolderelements.net/updates/.* - # Magento Plugins http://extensions.activo.com/.* http://amasty.com/.* -http://backwpup.com/.* -http://wpbakery.com/.* - # Joomla http://.*.joomla.org/.* http://getk2.org/.* @@ -88,12 +80,10 @@ http://mijosoft.com/.* http://www.joomlaworks.net/.* http://cdn.joomlaworks.org/.* http://download.regularlabs.com/.* - # Prestashop http://.*.prestashop.com/.* http://www.presta-module.com/.* http://www.presteamshop.com/.* - # Others http://.*.drupal.org/.* http://.*.dotclear.(net|org)/.* @@ -102,7 +92,6 @@ http://www.typolight.org/.* http://www.spip.net/.* ### Feeds / API / WS Tools / ... - # Google http://.*.googleapis.com/.* http://.*.google-analytics.com/.* @@ -111,24 +100,21 @@ http://csi.gstatic.com/.* http://maps.google.*/.* http://translate.google.com/.* http://www.google.com/webmasters/tools/.* - # Facebook http://.*.facebook.com/.* http://.*.fbcdn.net/.* - # Maxmind http://geolite.maxmind.com/.* - # Others -#http://.*.amazon.com/.* -http://.*.twitter.com/.* -http://.*.feedburner.com/.* -http://.*.openx.(org|com|net)/.* +http://.*amazon.com/.* +http://.*twitter.com/.* +http://.*feedburner.com/.* +http://.*openx.(org|com|net)/.* http://geoip-api.meteor.com/.* http://www.bing.com/.* http://www.telize.com/.* -http://.*.ident.me/.* -http://.*.icanhazip.com/.* +http://.*ident.me/.* +http://.*icanhazip.com/.* http://www.express-mailing.com/.* http://bot.whatismyipaddress.com/.* http://ipecho.net/.* @@ -139,5 +125,3 @@ http://mirrors.jenkins.io/.* http://jenkins.mirror.isppower.de/.* http://ftp.icm.edu.pl/.* http://apt.newrelic.com/.* -http://.*.cloudfront.net/.* -http://api.mailjet.com/.*