fix: last commit

Author: Tardo

docker-entrypoint.sh

@@ -1,12 +1,13 @@
 #!/bin/sh
 set -e
 
-echo "[entrypoint] loading privoxy environment...";
+echo "[entrypoint] loading privoxy environment..."
 
 privman --init
 
+
 if $ADBLOCK_NGINX_ENABLED && [ -n "$ADBLOCK_URLS" ]; then
-  print "[entrypoint] launching nginx..."
+  echo "[entrypoint] launching nginx..."
   envsubst '$NGINX_SERVER_NAME $NGINX_PORT $NGINX_PORT_SSL' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
   nginx
 fi
@@ -20,8 +21,8 @@ if [ ! -e /usr/local/etc/privoxy/config ] || [ -z "$(ls -A /usr/local/etc/privox
   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 privman-rules\/common.action\nactionsfile ab2p.system.action\nactionsfile ab2p.action' \
-    -e '/^filterfile user.filter/a filterfile privman-rules\/user.filter\nfilterfile privman-rules\/common.filter\nfilterfile ab2p.system.filter\nfilterfile ab2p.filter' \
+    -e '/^actionsfile user.action/a actionsfile ab2p.system.action\nactionsfile ab2p.action\nactionsfile privman-rules\/user.action\nactionsfile privman-rules\/common.action' \
+    -e '/^filterfile user.filter/a filterfile ab2p.system.filter\nfilterfile ab2p.filter\nfilterfile privman-rules\/user.filter\nfilterfile privman-rules\/common.filter' \
     -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/' \

templates/nginx.conf.template

@@ -49,6 +49,7 @@ http {
     ssl_session_tickets off; # Disable session tickets for security
     # HSTS for 2 years, including subdomains
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+    add_header Access-Control-Allow-Origin "*" always;
 
     #root = --webDir parameter value
     root /usr/local/etc/adblock2privoxy/css;
@@ -74,7 +75,6 @@ http {
       default_type text/css;
       add_header X-Content-Type-Options nosniff;
       add_header Cache-Control "public, max-age=31536000, immutable";
-      add_header Access-Control-Allow-Origin "*" always;
       try_files $uri $1;
     }
 
@@ -83,7 +83,6 @@ http {
       default_type text/css;
       add_header X-Content-Type-Options nosniff;
       add_header Cache-Control "public, max-age=31536000, immutable";
-      add_header Access-Control-Allow-Origin "*" always;
       rewrite ^/([^/]*?)\.([^/.]+)(?:\.([^/.]+))?(?:\.([^/.]+))?(?:\.([^/.]+))?(?:\.([^/.]+))?(?:\.([^/.]+))?(?:\.([^/.]+))?(?:\.([^/.]+))?/ab2p.css$ /$9/$8/$7/$6/$5/$4/$3/$2/$1/ab2p.css last;
     }
 
@@ -93,7 +92,6 @@ http {
       default_type text/css;
       add_header X-Content-Type-Options nosniff;
       add_header Cache-Control "public, max-age=31536000, immutable";
-      add_header Access-Control-Allow-Origin "*" always;
       try_files $uri $1ab2p.css;
     }
   }