update config and readme

.env.example

@@ -0,0 +1,9 @@
+#  _    _ _                       _  __
+# | |  (_) |__ _ _ _____ __ _____| |/ _|
+# | |__| | '_ \ '_/ -_) V  V / _ \ |  _|
+# |____|_|_.__/_| \___|\_/\_/\___/_|_|
+# Mail: secven@riseup.net
+
+SEARX_DOMAIN=search.secven.me
+WHOOGLE_DOMAIN=whoogle.secven.me
+SERVER_IP=195.0.0.201

.gitignore

@@ -2,3 +2,4 @@
 .vscode
 docker-compose.test.yml
 ssl
+.env

README.md

@@ -15,28 +15,22 @@
 #### Docker and Docker compose install
 
 ```sh
-sudo apt update && apt upgrade -y
+~$ sudo apt update && apt upgrade -y
-sudo apt install docker docker-compose -y
+~$ sudo apt install docker docker-compose nano make -y
 ```
 
-#### Заменить домен и айпи тачки в кофигах
+#### Редактируем наш конфиг на ваши данные
 
 ```sh
-docker-compose.cloudflare.yml
+~$ cp .env.example .env
-docker-compose.prod.yml
+~$ nano .env
 ````
 
-#### Заменить туть
+* SEARX_DOMAIN=`search.secven.me` заменить на ваш
+* WHOOGLE_DOMAIN=`whoogle.secven.me` заменить на ваш
+* SERVER_IP=`195.0.0.201` тут айпи тачки
 
-```sh
+### Install search-privacy Cloudflare CDN
-- SERVER_NAME=search.secven.me whoogle.secven.me # your domain
-- search.secven.me_REVERSE_PROXY_URL=/ # your domain
-- search.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:6060 # your domain and ip
-- whoogle.secven.me_REVERSE_PROXY_URL=/ # your domain
-- whoogle.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:5050 # your domain and ip
-````
-
-### Install Cloudflare CDN
 
 * Добавьте ваш домен в днс - https://i.imgur.com/AwRymuh.png
 * Настройка SSL/TLS - https://i.imgur.com/WQCy0RC.png
@@ -44,24 +38,24 @@ docker-compose.prod.yml
 #### Заблокировать censys
 
 ```sh
-iptables -A INPUT -s 198.108.66.0/23 -j DROP
+~$ iptables -A INPUT -s 198.108.66.0/23 -j DROP
-iptables -A INPUT -s 47.205.232.0/21 -j DROP
+~$ iptables -A INPUT -s 47.205.232.0/21 -j DROP
 ```
 
 ```sh
-git clone https://git.disroot.org/librewolf/search-privacy.git
+~$ git clone https://git.disroot.org/librewolf/search-privacy.git
-cd search-privacy
+~$ cd search-privacy
 
-make cf
+~$ make cf
 ```
 
-### Install Default Server Prod
+### Install Search-privacy default server prod 
 
 ```sh
-git clone https://git.disroot.org/librewolf/search-privacy.git
+~$ git clone https://git.disroot.org/librewolf/search-privacy.git
-cd search-privacy
+~$ cd search-privacy
 
-make prod
+~$ make prod
 ```
 
 ### Author

docker-compose.cloudflare.yml

@@ -16,7 +16,7 @@ services:
       - 80:8080
     environment:
       - MULTISITE=yes
-      - SERVER_NAME=search.secven.me whoogle.secven.me #your domain
+      - SERVER_NAME=${SEARX_DOMAIN} ${WHOOGLE_DOMAIN}
       - ALLOWED_METHODS=GET|POST|HEAD
       - DISABLE_DEFAULT_SERVER=yes
       - BLOCK_PROXIES=no
@@ -43,10 +43,10 @@ services:
       - CONTENT_SECURITY_POLICY=
       - PROXY_REAL_IP=yes
       - PROXY_REAL_IP_FROM=173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 172.64.0.0/13 131.0.72.0/22 104.16.0.0/13 104.24.0.0/14
-      - search.secven.me_REVERSE_PROXY_URL=/
+      - ${SEARX_DOMAIN}_REVERSE_PROXY_URL=/
-      - search.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:6060
+      - ${SEARX_DOMAIN}_REVERSE_PROXY_HOST=http://${SERVER_IP}:6060
-      - whoogle.secven.me_REVERSE_PROXY_URL=/
+      - ${WHOOGLE_DOMAIN}_REVERSE_PROXY_URL=/
-      - whoogle.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:5050
+      - ${WHOOGLE_DOMAIN}_REVERSE_PROXY_HOST=http://${SERVER_IP}:5050
 
   search:
     image: searx/searx
@@ -54,7 +54,7 @@ services:
     ports:
       - 6060:8080
     environment:
-      - BASE_URL=https://search.secven.me/ #your domain name
+      - BASE_URL=https://${SEARX_DOMAIN}/
 
   whoogle:
     image: secven/whoogle

docker-compose.prod.yml

@@ -17,7 +17,7 @@ services:
       - 443:8443
     environment:
       - MULTISITE=yes
-      - SERVER_NAME=search.secven.me whoogle.secven.me #your domain
+      - SERVER_NAME=${SEARX_DOMAIN} ${WHOOGLE_DOMAIN}
       - HTTP2=yes
       - LISTEN_HTTP=no
       - HTTPS_PROTOCOLS=TLSv1.2 TLSv1.3
@@ -40,10 +40,10 @@ services:
       - USE_GZIP=yes
       - USE_REVERSE_PROXY=yes
       - PROXY_REAL_IP=yes
-      - search.secven.me_REVERSE_PROXY_URL=/
+      - ${SEARX_DOMAIN}_REVERSE_PROXY_URL=/
-      - search.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:6060
+      - ${SEARX_DOMAIN}_REVERSE_PROXY_HOST=http://${SERVER_IP}:6060
-      - whoogle.secven.me_REVERSE_PROXY_URL=/
+      - ${WHOOGLE_DOMAIN}_REVERSE_PROXY_URL=/
-      - whoogle.secven.me_REVERSE_PROXY_HOST=http://195.0.0.201:5050
+      - ${WHOOGLE_DOMAIN}_REVERSE_PROXY_HOST=http://${SERVER_IP}:5050
 
   search:
     image: searx/searx