Merge pull request #6475 from stylefieber/next

Update plausible.yaml and shlink.yaml - clickhouse config contents were swapped; fixing double https:// issue in shlink web app
This commit is contained in:
Andras Bacsai 2025-10-17 10:56:41 +02:00 committed by GitHub
commit 8b12f1dba4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View file

@ -70,12 +70,12 @@ services:
source: ./clickhouse/clickhouse-config.xml source: ./clickhouse/clickhouse-config.xml
target: /etc/clickhouse-server/config.d/logging.xml target: /etc/clickhouse-server/config.d/logging.xml
read_only: true read_only: true
content: "<clickhouse><profiles><default><log_queries>0</log_queries><log_query_threads>0</log_query_threads></default></profiles></clickhouse>" content: "<clickhouse><logger><level>warning</level><console>true</console></logger><query_thread_log remove="remove"/><query_log remove="remove"/><text_log remove="remove"/><trace_log remove="remove"/><metric_log remove="remove"/><asynchronous_metric_log remove="remove"/><session_log remove="remove"/><part_log remove="remove"/></clickhouse>"
- type: bind - type: bind
source: ./clickhouse/clickhouse-user-config.xml source: ./clickhouse/clickhouse-user-config.xml
target: /etc/clickhouse-server/users.d/logging.xml target: /etc/clickhouse-server/users.d/logging.xml
read_only: true read_only: true
content: '<clickhouse><logger><level>warning</level><console>true</console></logger><query_thread_log remove="remove"/><query_log remove="remove"/><text_log remove="remove"/><trace_log remove="remove"/><metric_log remove="remove"/><asynchronous_metric_log remove="remove"/><session_log remove="remove"/><part_log remove="remove"/></clickhouse>' content: '<clickhouse><profiles><default><log_queries>0</log_queries><log_query_threads>0</log_query_threads></default></profiles></clickhouse>'
ulimits: ulimits:
nofile: nofile:
soft: 262144 soft: 262144

View file

@ -9,7 +9,7 @@ services:
image: shlinkio/shlink:stable image: shlinkio/shlink:stable
environment: environment:
- SERVICE_URL_SHLINK_8080 - SERVICE_URL_SHLINK_8080
- DEFAULT_DOMAIN=${SERVICE_URL_SHLINK} - DEFAULT_DOMAIN=${SERVICE_FQDN_SHLINK}
- IS_HTTPS_ENABLED=false - IS_HTTPS_ENABLED=false
- INITIAL_API_KEY=${SERVICE_BASE64_SHLINKAPIKEY} - INITIAL_API_KEY=${SERVICE_BASE64_SHLINKAPIKEY}
volumes: volumes: