From 42442cb1f8ce35086299e50f41d2e3f8cb4898fc Mon Sep 17 00:00:00 2001
From: akanealw <akanealw@gmail.com>
Date: Mon, 6 Nov 2023 14:10:40 -0600
Subject: [PATCH] reordered docker compose removed searxng

---
 piped/docker-compose.yml | 44 ++++++++++++++++++++++------------------
 searxng/settings.yml     |  9 --------
 2 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 searxng/settings.yml

diff --git a/piped/docker-compose.yml b/piped/docker-compose.yml
index c4f8632..772d92c 100644
--- a/piped/docker-compose.yml
+++ b/piped/docker-compose.yml
@@ -2,33 +2,41 @@ version: '3'
 
 services:
     piped-frontend:
+        container_name: piped-frontend
         image: 1337kavin/piped-frontend:latest
-        restart: unless-stopped
+        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/pipedapi.akanealw.com/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
         depends_on:
             - piped
-        container_name: piped-frontend
-        entrypoint: ash -c 'sed -i s/pipedapi.kavin.rocks/pipedapi.akanealw.com/g /usr/share/nginx/html/assets/* && /docker-entrypoint.sh && nginx -g "daemon off;"'
+        restart: always
+
     piped-proxy:
+        container_name: piped-proxy
         image: 1337kavin/piped-proxy:latest
-        restart: unless-stopped
         environment:
             - UDS=1
+        restart: always
         volumes:
             - ${DOCKER_CONFIGS}/piped/piped-proxy:/app/socket
-        container_name: piped-proxy
+
     piped:
+        container_name: piped-backend
         image: 1337kavin/piped:latest
-        restart: unless-stopped
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/config/config.properties:/app/config.properties:ro
         depends_on:
             - piped-postgres
-        container_name: piped-backend
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/config/config.properties:/app/config.properties:ro
+
     piped-nginx:
+        container_name: piped-nginx
         image: nginx:mainline-alpine
-        restart: unless-stopped
+        depends_on:
+            - piped
+            - piped-proxy
+            - piped-frontend
         ports:
-            - "8080:80"
+            - "8585:80"
+        restart: always
         volumes:
             - ${DOCKER_CONFIGS}/piped/config/nginx.conf:/etc/nginx/nginx.conf:ro
             - ${DOCKER_CONFIGS}/piped/config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro
@@ -36,21 +44,17 @@ services:
             - ${DOCKER_CONFIGS}/piped/config/pipedfrontend.conf:/etc/nginx/conf.d/pipedfrontend.conf:ro
             - ${DOCKER_CONFIGS}/piped/config/ytproxy.conf:/etc/nginx/snippets/ytproxy.conf:ro
             - ${DOCKER_CONFIGS}/piped/piped-proxy:/var/run/ytproxy
-        container_name: piped-nginx
-        depends_on:
-            - piped
-            - piped-proxy
-            - piped-frontend
+
     piped-postgres:
+        container_name: piped-postgres
         image: postgres:15
-        restart: unless-stopped
-        volumes:
-            - ${DOCKER_CONFIGS}/piped/data/db:/var/lib/postgresql/data
         environment:
             - POSTGRES_DB=piped
             - POSTGRES_USER=piped
             - POSTGRES_PASSWORD=Vee0caiv8ieceeDae1aepheirophai
-        container_name: piped-postgres
+        restart: always
+        volumes:
+            - ${DOCKER_CONFIGS}/piped/data/db:/var/lib/postgresql/data
 
 networks:
     piped:
diff --git a/searxng/settings.yml b/searxng/settings.yml
deleted file mode 100644
index 4f057e0..0000000
--- a/searxng/settings.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-use_default_settings: true
-server:
-  secret_key: "6f4b521aca4496d216735230706161160e34e0f51071130d5813bc2730b97ca3"
-  limiter: false
-  image_proxy: true
-ui:
-  static_use_hash: true
-redis:
-  url: redis://searxng-redis:6379/0