diff --git a/templates/conf/Caddyfile.j2 b/templates/conf/Caddyfile.j2 index 6e2366a..6c3b5b4 100755 --- a/templates/conf/Caddyfile.j2 +++ b/templates/conf/Caddyfile.j2 @@ -77,7 +77,16 @@ handle { encode zstd gzip - reverse_proxy {{ oracle4_private_ip }}:8080 { + reverse_proxy { + to {{ oracle1_private_ip }}:8080 + to {{ oracle2_private_ip }}:8080 + to {{ oracle3_private_ip }}:8080 + to {{ oracle4_private_ip }}:8080 + lb_policy ip_hash + lb_try_duration 5s + lb_try_interval 1s + fail_duration 30s + max_fails 3 header_up X-Real-IP {remote_host} header_up X-Forwarded-Port {http.request.port} header_up X-Forwarded-Proto {http.request.scheme} diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2 index 2e4ebd0..46d3b6f 100755 --- a/templates/conf/settings.yml.j2 +++ b/templates/conf/settings.yml.j2 @@ -1121,6 +1121,7 @@ engines: - name: google scholar engine: google_scholar shortcut: gos + categories: "science" - name: google play apps engine: google_play @@ -2580,7 +2581,6 @@ engines: content_xpath: //p[contains(@class,'url fsM')]/following-sibling::p first_page_num: 0 categories: [general, web] - disabled: true timeout: 4.0 about: website: https://search.goo.ne.jp @@ -2589,6 +2589,7 @@ engines: require_api_key: false results: HTML language: ja + disabled: true - name: bt4g engine: bt4g diff --git a/vars/services.yaml b/vars/services.yaml index d4a3523..86905ad 100644 --- a/vars/services.yaml +++ b/vars/services.yaml @@ -1,37 +1,10 @@ -<<<<<<< Updated upstream -compose: - oracle4: - - paulgo - -config: - oracle4: -======= -remove: - oracle1: - - paulgo - oracle2: - - paulgo - oracle3: - - paulgo - -down: - oracle1: - - paulgo - oracle2: - - paulgo - oracle3: - - paulgo - config: oracle4: - caddy - - paulgo compose: oracle4: - caddy ->>>>>>> Stashed changes - - paulgo # ----------------------------------------------------------------------------------------------------