Add CatBot UA, Expose to Web, Update mariadb to jammy,Add 161.sh domains
This commit is contained in:
parent
d05c916491
commit
cde3a885cb
15
run/conf/properties/system.properties
Normal file
15
run/conf/properties/system.properties
Normal file
@ -0,0 +1,15 @@
|
||||
crawler.userAgentString = Mozilla/5.0 (compatible)
|
||||
crawler.userAgentIdentifier = CatBot
|
||||
crawler.poolSize = 256
|
||||
|
||||
log4j2.configurationFile=log4j2-test.xml
|
||||
|
||||
search.websiteUrl = https://cia.161.sh/
|
||||
|
||||
executor.uploadDir = /uploads
|
||||
converter.sideloadThreshold = 10000
|
||||
|
||||
ip-blocklist.disabled = false
|
||||
blacklist.disable = false
|
||||
flyway.disable = false
|
||||
control.hideMarginaliaApp = false
|
@ -14,6 +14,8 @@ x-svc: &service
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 60
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
x-p1: &partition-1
|
||||
env_file:
|
||||
- "${INSTALL_DIR}/env/service.env"
|
||||
@ -37,6 +39,8 @@ x-p1: &partition-1
|
||||
- wmsa
|
||||
environment:
|
||||
- "WMSA_SERVICE_NODE=1"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
x-p2: &partition-2
|
||||
env_file:
|
||||
- "${INSTALL_DIR}/env/service.env"
|
||||
@ -60,6 +64,8 @@ x-p2: &partition-2
|
||||
- wmsa
|
||||
environment:
|
||||
- "WMSA_SERVICE_NODE=2"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
services:
|
||||
index-service-1:
|
||||
<<: *partition-1
|
||||
@ -68,6 +74,8 @@ services:
|
||||
depends_on:
|
||||
control-service:
|
||||
condition: service_healthy
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
executor-service-1:
|
||||
<<: *partition-1
|
||||
image: "marginalia/executor-service"
|
||||
@ -75,6 +83,8 @@ services:
|
||||
depends_on:
|
||||
control-service:
|
||||
condition: service_healthy
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
index-service-2:
|
||||
<<: *partition-2
|
||||
image: "marginalia/index-service"
|
||||
@ -82,6 +92,8 @@ services:
|
||||
depends_on:
|
||||
control-service:
|
||||
condition: service_healthy
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
executor-service-2:
|
||||
<<: *partition-2
|
||||
image: "marginalia/executor-service"
|
||||
@ -89,6 +101,8 @@ services:
|
||||
depends_on:
|
||||
control-service:
|
||||
condition: service_healthy
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
query-service:
|
||||
<<: *service
|
||||
image: "marginalia/query-service"
|
||||
@ -96,6 +110,8 @@ services:
|
||||
depends_on:
|
||||
control-service:
|
||||
condition: service_healthy
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
search-service:
|
||||
<<: *service
|
||||
image: "marginalia/search-service"
|
||||
@ -113,6 +129,8 @@ services:
|
||||
- "traefik.http.routers.search-service.middlewares=add-public"
|
||||
- "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1"
|
||||
- "traefik.http.middlewares.add-public.addprefix.prefix=/public"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
assistant-service:
|
||||
<<: *service
|
||||
image: "marginalia/assistant-service"
|
||||
@ -134,6 +152,8 @@ services:
|
||||
- "traefik.http.routers.assistant-service-suggest.middlewares=add-public"
|
||||
- "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1"
|
||||
- "traefik.http.middlewares.add-public.addprefix.prefix=/public"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
api-service:
|
||||
<<: *service
|
||||
image: "marginalia/api-service"
|
||||
@ -151,6 +171,8 @@ services:
|
||||
- "traefik.http.routers.api-service.middlewares=add-public"
|
||||
- "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1"
|
||||
- "traefik.http.middlewares.add-public.addprefix.prefix=/public"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
control-service:
|
||||
<<: *service
|
||||
image: "marginalia/control-service"
|
||||
@ -168,15 +190,16 @@ services:
|
||||
- "traefik.http.routers.control-service.middlewares=add-public"
|
||||
- "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1"
|
||||
- "traefik.http.middlewares.add-public.addprefix.prefix=/public"
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
mariadb:
|
||||
image: "mariadb:lts"
|
||||
image: "mariadb:lts-jammy"
|
||||
container_name: "mariadb"
|
||||
env_file: "${INSTALL_DIR}/env/mariadb.env"
|
||||
command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
|
||||
ports:
|
||||
- "127.0.0.1:3306:3306/tcp"
|
||||
healthcheck:
|
||||
test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval}
|
||||
test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
|
||||
start_period: 5s
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
@ -185,6 +208,9 @@ services:
|
||||
- db:/var/lib/mysql
|
||||
networks:
|
||||
- wmsa
|
||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
traefik:
|
||||
image: "traefik:v2.10"
|
||||
container_name: "traefik"
|
||||
@ -197,14 +223,16 @@ services:
|
||||
- "--entrypoints.control.address=:81"
|
||||
- "--entrypoints.api.address=:82"
|
||||
ports:
|
||||
- "127.0.0.1:8080:80"
|
||||
- "127.0.0.1:8081:81"
|
||||
- "127.0.0.1:8082:82"
|
||||
- "127.0.0.1:8090:8080"
|
||||
- "0.0.0.0:8080:80"
|
||||
- "0.0.0.0:8081:81"
|
||||
- "0.0.0.0:8082:82"
|
||||
- "0.0.0.0:8090:8080"
|
||||
volumes:
|
||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||
networks:
|
||||
- wmsa
|
||||
extra_hosts:
|
||||
- "161.sh git.161.sh why.161.sh cis.161.sh cia.161.sh:192.168.122.198"
|
||||
networks:
|
||||
wmsa:
|
||||
volumes:
|
||||
@ -297,4 +325,4 @@ volumes:
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: ${INSTALL_DIR}/index-2/backup
|
||||
device: ${INSTALL_DIR}/index-2/backup
|
||||
|
Loading…
Reference in New Issue
Block a user