From 599fad327e44dfd42bbfca4567e045716ce7cc83 Mon Sep 17 00:00:00 2001 From: Steven Thomas Smith Date: Mon, 17 Jun 2019 20:27:56 -0400 Subject: [PATCH] Upgrade to ghc 8.6.5, lts-13.25 resolver, v2.0.1 --- adblock2privoxy-utils/adblock2privoxy-utils.cabal | 6 +++--- adblock2privoxy/adblock2privoxy.cabal | 6 +++--- adblock2privoxy/changelog | 3 +++ adblock2privoxy/stack.yaml | 2 +- nginx.conf | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/adblock2privoxy-utils/adblock2privoxy-utils.cabal b/adblock2privoxy-utils/adblock2privoxy-utils.cabal index c7c4b5569..e7de1a95d 100644 --- a/adblock2privoxy-utils/adblock2privoxy-utils.cabal +++ b/adblock2privoxy-utils/adblock2privoxy-utils.cabal @@ -1,8 +1,8 @@ name: adblock2privoxy-utils -version: 2.0.0 +version: 2.0.1 cabal-version: >= 1.10 build-type: Simple -tested-with: GHC==8.4.3 +tested-with: GHC==8.6.5 author: Alexey Zubritsky , Steven Thomas Smith homepage: https://github.com/essandess/adblock2privoxy category: Web @@ -46,4 +46,4 @@ source-repository this type: git location: ​https://github.com/essandess/adblock2privoxy.git subdir: adblock2privoxy-utils - tag: 2.0.0 + tag: 2.0.1 diff --git a/adblock2privoxy/adblock2privoxy.cabal b/adblock2privoxy/adblock2privoxy.cabal index 5f8b8bb27..e621e37db 100644 --- a/adblock2privoxy/adblock2privoxy.cabal +++ b/adblock2privoxy/adblock2privoxy.cabal @@ -1,9 +1,9 @@ name: adblock2privoxy -version: 2.0.0 +version: 2.0.1 cabal-version: >= 1.10 build-type: Simple tested-with: - GHC==8.4.3 + GHC==8.6.5 author: Alexey Zubritsky , Steven Thomas Smith data-files: templates/ab2p.system.action, @@ -103,4 +103,4 @@ source-repository this type: git location: ​https://github.com/essandess/adblock2privoxy.git subdir: adblock2privoxy - tag: 2.0.0 + tag: 2.0.1 diff --git a/adblock2privoxy/changelog b/adblock2privoxy/changelog index 2523ca4d0..bb74bc6da 100644 --- a/adblock2privoxy/changelog +++ b/adblock2privoxy/changelog @@ -1,3 +1,6 @@ +2.0.1 + * Update to ghc 8.6.5, lts-13.25 resolver + 2.0.0 * Update to ghc 8.4.3 * Regex wildcard optimizations diff --git a/adblock2privoxy/stack.yaml b/adblock2privoxy/stack.yaml index bbb6d3035..3c750d959 100644 --- a/adblock2privoxy/stack.yaml +++ b/adblock2privoxy/stack.yaml @@ -1,7 +1,7 @@ # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) -resolver: lts-12.9 +resolver: lts-13.25 # Local packages, usually specified by relative directory name packages: diff --git a/nginx.conf b/nginx.conf index 816bd0afb..6e4af63f4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -7,11 +7,11 @@ events { # this must be consistent with daemondo's --pidfile specification pid /opt/local/var/run/nginx/nginx-adblock2privoxy.pid; -# error_log /opt/local/var/log/nginx/error_adblock2privoxy.log warn; +# error_log /opt/local/var/log/nginx/error-adblock2privoxy.log warn; error_log off; http { - # access_log /opt/local/var/log/nginx/access_adblock2privoxy.log; + # access_log /opt/local/var/log/nginx/access-adblock2privoxy.log; access_log off; # avoid error 413 Request Entity Too Large