fix: custom config

Author: Tardo

Dockerfile

@@ -130,35 +130,10 @@ RUN set -ex; \
     mkdir -p /var/log/privoxy /usr/local/etc/privoxy/CA /usr/local/etc/privoxy/certs /usr/local/etc/privoxy/privman-rules; \
     chown -R privoxy:privoxy /var/log/privoxy /usr/local/etc/privoxy; \
     chmod +x /usr/local/sbin/privoxy; \
-    cp -a /usr/local/etc/privoxy /opt/privoxy-default; \
     # Change the default config
-    cp /usr/local/etc/privoxy/config /usr/local/etc/privoxy/config.orig; \
+    mv /usr/local/etc/privoxy/config /usr/local/etc/privoxy/config.orig; \
     sed -i '/^+set-image-blocker{pattern}/a +https-inspection \\' /usr/local/etc/privoxy/match-all.action; \
-    sed -i \
-        -e 's/^confdir .+/confdir \/usr\/local\/etc\/privoxy/' \
-        -e 's/^templdir .+/templdir \/usr\/local\/etc\/privoxy\/templates/' \
-        -e '/^actionsfile user.action/a actionsfile privman-rules\/user.action\nactionsfile ab2p.system.action\nactionsfile ab2p.action' \
-        -e '/^filterfile user.filter/a filterfile privman-rules\/user.filter\nfilterfile ab2p.system.filter\nfilterfile ab2p.filter' \
-        -e 's/^#debug     1.+/debug     1/' \
-        -e 's/^#debug   512.+/debug   512/' \
-        -e 's/^#debug  1024.+/debug  1024/' \
-        -e 's/^#debug  8192.+/debug  8192/' \
-        -e 's/^listen-address .+/listen-address  0.0.0.0:${PRIVOXY_PORT}/' \
-        -e 's/^enforce-blocks .+/#enforce-blocks 0/' \
-        -e 's/^buffer-limit .+/buffer-limit 25600/' \
-        -e 's/^keep-alive-timeout .+/keep-alive-timeout 120/' \
-        -e 's/^tolerate-pipelining .+/tolerate-pipelining 0/' \
-        -e 's/^socket-timeout .+/socket-timeout 30/' \
-        -e 's/^#max-client-connections .+/max-client-connections 256/' \
-        -e 's/^#listen-backlog .+/listen-backlog 128/' \
-        -e 's/^#ca-directory .+/ca-directory \/usr\/local\/etc\/privoxy\/CA/' \
-        -e 's/^#ca-cert-file .+/ca-cert-file privoxy-ca-bundle.crt/' \
-        -e 's/^#ca-key-file .+/ca-key-file cakey.pem/' \
-        -e 's/^#certificate-directory .+/certificate-directory \/usr\/local\/etc\/privoxy\/certs/' \
-        -e 's/^#trusted-cas-file .+/trusted-cas-file trustedCAs.pem/' \
-        -e '$a\receive-buffer-size 32768' \
-        -e '$a\cipher-list ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' \
-    /usr/local/etc/privoxy/config; \
+    cp -a /usr/local/etc/privoxy /opt/privoxy-default; \
     chmod +x /usr/local/sbin/privoxy;
 
 # adblock2privoxy

README.md

@@ -105,6 +105,21 @@ docker cp privoxy:/usr/local/etc/privoxy/CA/privoxy-ca-bundle.crt .
 | /usr/local/etc/privoxy/certs | Where privoxy stores the downloaded certificates |
 | /var/lib/privoxy | Where are the scripts related to privoxy |
 
+## :wrench: Custom configuration
+
+- If want privman blocking need add:
+    ```yaml
+    actionsfile privman-rules/user.action
+    filterfile privman-rules/user.filter
+    ```
+- If want adblock2privoxy blocking need add:
+    ```yaml
+    actionsfile ab2p.system.action
+    actionsfile ab2p.action
+    filterfile ab2p.system.filter
+    filterfile ab2p.filter
+    ```
+
 ## :computer: Privoxy Compiler Options
 
 - --disable-toggle

docker-entrypoint.sh

@@ -10,6 +10,32 @@ fi
 if [ ! -e /usr/local/etc/privoxy/config ] || [ -z "$(ls -A /usr/local/etc/privoxy)" ]; then
   echo "[entrypoint] void config, populating defaults..."
   cp -a /opt/privoxy-default/* /usr/local/etc/privoxy/
+  cp /usr/local/etc/privoxy/config.orig /usr/local/etc/privoxy/config
+  sed -i \
+    -e 's/^confdir .+/confdir \/usr\/local\/etc\/privoxy/' \
+    -e 's/^templdir .+/templdir \/usr\/local\/etc\/privoxy\/templates/' \
+    -e '/^actionsfile user.action/a actionsfile privman-rules\/user.action\nactionsfile ab2p.system.action\nactionsfile ab2p.action' \
+    -e '/^filterfile user.filter/a filterfile privman-rules\/user.filter\nfilterfile ab2p.system.filter\nfilterfile ab2p.filter' \
+    -e 's/^#debug     1.+/debug     1/' \
+    -e 's/^#debug   512.+/debug   512/' \
+    -e 's/^#debug  1024.+/debug  1024/' \
+    -e 's/^#debug  8192.+/debug  8192/' \
+    -e 's/^listen-address .+/listen-address  0.0.0.0:${PRIVOXY_PORT}/' \
+    -e 's/^enforce-blocks .+/#enforce-blocks 0/' \
+    -e 's/^buffer-limit .+/buffer-limit 25600/' \
+    -e 's/^keep-alive-timeout .+/keep-alive-timeout 120/' \
+    -e 's/^tolerate-pipelining .+/tolerate-pipelining 0/' \
+    -e 's/^socket-timeout .+/socket-timeout 30/' \
+    -e 's/^#max-client-connections .+/max-client-connections 256/' \
+    -e 's/^#listen-backlog .+/listen-backlog 128/' \
+    -e 's/^#ca-directory .+/ca-directory \/usr\/local\/etc\/privoxy\/CA/' \
+    -e 's/^#ca-cert-file .+/ca-cert-file privoxy-ca-bundle.crt/' \
+    -e 's/^#ca-key-file .+/ca-key-file cakey.pem/' \
+    -e 's/^#certificate-directory .+/certificate-directory \/usr\/local\/etc\/privoxy\/certs/' \
+    -e 's/^#trusted-cas-file .+/trusted-cas-file trustedCAs.pem/' \
+    -e '$a\receive-buffer-size 32768' \
+    -e '$a\cipher-list ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' \
+  /usr/local/etc/privoxy/config
 fi
 
 echo "[entrypoint] starting..."