fix piped caddyfile

This commit is contained in:
Arya 2023-07-19 19:50:55 +05:30
parent 1f2d73edc9
commit 1374041672
Signed by: arya
GPG Key ID: 842D12BDA50DF120
4 changed files with 8 additions and 8 deletions

View File

@ -5,14 +5,14 @@ services:
image: codeberg.org/hyperpipe/hyperpipe:latest image: codeberg.org/hyperpipe/hyperpipe:latest
container_name: hyperpipe-frontend container_name: hyperpipe-frontend
restart: unless-stopped restart: unless-stopped
entrypoint: sh -c 'find /usr/share/nginx/html -type f -exec sed -i s/pipedapi.kavin.rocks/{% if inventory_hostname == 'eu' %}api.piped.projectsegfau.lt{%else%}pipedapi.{{inventory_hostname}}.projectsegfau.lt{%endif%}/g {} \; -exec sed -i s/hyperpipeapi.onrender.com/hyperpipebackend.{{ inventory_hostname }}.projectsegfau.lt/g {} \; && /docker-entrypoint.sh && nginx -g "daemon off;"' entrypoint: sh -c 'find /usr/share/nginx/html -type f -exec sed -i s/pipedapi.kavin.rocks/{% if server_prefix == 'eu' %}api.piped.projectsegfau.lt{%else%}pipedapi.{{server_prefix}}.projectsegfau.lt{%endif%}/g {} \; -exec sed -i s/hyperpipeapi.onrender.com/hyperpipebackend.{{ server_prefix }}.projectsegfau.lt/g {} \; && /docker-entrypoint.sh && nginx -g "daemon off;"'
ports: ports:
- '8843:80' - '8843:80'
hyperpipe-backend: hyperpipe-backend:
image: codeberg.org/hyperpipe/hyperpipe-backend:latest image: codeberg.org/hyperpipe/hyperpipe-backend:latest
container_name: hyperpipe-backend container_name: hyperpipe-backend
environment: environment:
- HYP_PROXY={% if inventory_hostname == 'eu' %}proxy.piped.projectsegfau.lt{%else%}pipedproxy.{{inventory_hostname}}.projectsegfau.lt{%endif%} - HYP_PROXY={% if server_prefix == 'eu' %}proxy.piped.projectsegfau.lt{%else%}pipedproxy.{{server_prefix}}.projectsegfau.lt{%endif%}
restart: unless-stopped restart: unless-stopped
ports: ports:

View File

@ -5,7 +5,7 @@ services:
ports: ports:
- "5070:80" - "5070:80"
environment: environment:
- SAFETWITCH_BACKEND_DOMAIN=api.safetwitch.{{inventory_hostname}}.projectsegfau.lt - SAFETWITCH_BACKEND_DOMAIN=api.safetwitch.{{server_prefix}}.projectsegfau.lt
- SAFETWITCH_INSTANCE_DOMAIN=safetwitch.projectsegfau.lt - SAFETWITCH_INSTANCE_DOMAIN=safetwitch.projectsegfau.lt
- SAFETWITCH_HTTPS=true - SAFETWITCH_HTTPS=true
restart: always restart: always
@ -15,5 +15,5 @@ services:
- "5071:7000" - "5071:7000"
environment: environment:
- PORT=7000 - PORT=7000
- URL=https://api.safetwitch.{{inventory_hostname}}.projectsegfau.lt - URL=https://api.safetwitch.{{server_prefix}}.projectsegfau.lt
restart: always restart: always

View File

@ -29,7 +29,7 @@ services:
- ./searxng:/etc/searxng:rw - ./searxng:/etc/searxng:rw
- ./extras.conf:/etc/searxng/settings.yml:rw - ./extras.conf:/etc/searxng/settings.yml:rw
environment: environment:
- SEARXNG_BASE_URL=https://search.{{inventory_hostname}}.projectsegfau.lt/ - SEARXNG_BASE_URL=https://{% if server_prefix == 'eu' %}search.projectsegfau.lt{%else%}search.{{inventory_hostname}}.projectsegfau.lt{%endif%}/
cap_drop: cap_drop:
- ALL - ALL
cap_add: cap_add:

View File

@ -246,7 +246,7 @@ search.{{ server_prefix }}.projectsegfau.lt search.projectsegfau.lt s.psf.lt s.{
Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self' https://github.com/searxng/searxng/issues/new; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com" Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self' https://github.com/searxng/searxng/issues/new; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com"
} }
} }
piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt { {% if server_prefix == 'eu' %}piped.projectsegfau.lt proxy.piped.projectsegfau.lt api.piped.projectsegfau.lt {%else%} piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt {%endif%} {
reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970 reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970
header { header {
# disable FLoC tracking # disable FLoC tracking
@ -277,9 +277,9 @@ piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projec
import acmedns import acmedns
{% endif %} {% endif %}
} }
pi.{{ server_prefix }}.psf.lt { pi.{{ server_prefix }}.psf.lt pi.psf.lt {
reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970 { reverse_proxy {% if inventory_hostname == 'core' %}192.168.5.2{% endif %}:6970 {
header_up Host "piped.{{ server_prefix }}.projectsegfau.lt" header_up Host "{% if server_prefix == 'eu' %}piped.projectsegfau.lt{%else%}piped.{{ server_prefix }}.projectsegfau.lt{%endif%}"
} }
header { header {
# disable FLoC tracking # disable FLoC tracking