get rid of the captcha stuff, put proxies in data

Signed-off-by: ngn <ngn@ngn.tf>

.gitignore

@@ -1,5 +1,5 @@
 /compose.yml
 /docker-compose.yml
-/banners
-/captcha
+/banner
+/favicon.ico
 /config.php

compose.example.yml

@@ -6,8 +6,8 @@ services:
       - 80:8080
     volumes:
       - ./config.php:/srv/4get/data/config.php:ro
-      - ./banners:/srv/4get/banner:ro
-      - ./captcha:/srv/4get/data/captcha:ro
+      - ./favicon.ico:/srv/4get/favicon.ico:ro
+      - ./banner:/srv/4get/banner:ro
       - type: tmpfs
         target: /tmp/icons
     cap_drop:

src/.gitignore

@@ -21,9 +21,8 @@ scraper/soundcloud.json
 scraper/mp3-pm.html
 scraper/curlie.html
 
-icons/*
 banner/*
-!banner/*default*
+data/*
 
-data/captcha
-data/config.php
+!banner/*default*
+!data/*.def.*

src/data/config.def.php

@@ -37,8 +37,8 @@ class config{
 
 	// Proxy pool assignments for each scraper
 	// false = Use server's raw IP
-	// string = will load a proxy list from data/proxies
-	// Eg. "onion" will load data/proxies/onion.txt
+	// string = will load a proxy list from data directory
+	// Eg. "tor" will load data/tor.txt
 	const PROXY_DDG = false; // duckduckgo
 	const PROXY_BRAVE = false;
 	const PROXY_FB = false; // facebook

src/data/proxies/.gitignore

@@ -1,3 +0,0 @@
-*
-!.gitignore
-!onion.txt

src/lib/backend.php

@@ -21,7 +21,7 @@ class backend{
 		// indent
 		$proxy_index_raw = apcu_inc("p." . $this->scraper);
 
-		$proxylist = file_get_contents("data/proxies/" . $pool . ".txt");
+		$proxylist = file_get_contents("data/" . $pool . ".txt");
 		$proxylist = explode("\n", $proxylist);
 
 		// ignore empty or commented lines