Merge 35f4c0f1f6 into 54aaf03453

Merge branch 'master' into dev
Add simple analytics
2026-01-11 09:41:40 -05:00 · 2025-07-16 07:13:05 +02:00 · 2025-07-14 21:30:51 +02:00 · 2025-07-14 21:26:19 +02:00 · 2025-07-09 19:39:08 +01:00 · 2025-07-02 21:54:51 +02:00
7 changed files with 13 additions and 8 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -17,6 +17,9 @@

    <%= render 'application/favicon' %>
    <%= Sentry.get_trace_propagation_meta.html_safe if Sentry.initialized? %>
+    <% if !DawarichSettings.self_hosted? %>
+      <script async src="https://scripts.simpleanalyticscdn.com/latest.js"></script>
+    <% end %>
  </head>

  <body class='min-h-screen'>
--- a/config/cable.yml
+++ b/config/cable.yml
@ -1,11 +1,13 @@
 development:
  adapter: redis
-  url: <%= "#{ENV.fetch("REDIS_URL")}/#{ENV.fetch('RAILS_WS_DB', 2)}" %>
+  url: <%= "#{ENV.fetch("REDIS_URL")}" %>
+  db: <%= "#{ENV.fetch('RAILS_WS_DB', 2)}" %>

 test:
  adapter: test

 production:
  adapter: redis
-  url: <%= "#{ENV.fetch("REDIS_URL")}/#{ENV.fetch('RAILS_WS_DB', 2)}" %>
+  url: <%= "#{ENV.fetch("REDIS_URL")}" %>
+  db: <%= "#{ENV.fetch('RAILS_WS_DB', 2)}" %>
  channel_prefix: dawarich_production
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@ -26,7 +26,7 @@ Rails.application.configure do

  # Enable/disable caching. By default caching is disabled.
  # Run rails dev:cache to toggle caching.
-  config.cache_store = :redis_cache_store, { url: "#{ENV['REDIS_URL']}/#{ENV.fetch('RAILS_CACHE_DB', 0)}" }
+  config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], db: ENV.fetch('RAILS_CACHE_DB', 0) }

  if Rails.root.join('tmp/caching-dev.txt').exist?
    config.action_controller.perform_caching = true
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -73,7 +73,7 @@ Rails.application.configure do
  config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'info')

  # Use a different cache store in production.
-  config.cache_store = :redis_cache_store, { url: "#{ENV['REDIS_URL']}/#{ENV.fetch('RAILS_CACHE_DB', 0)}" }
+  config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], db: ENV.fetch('RAILS_CACHE_DB', 0) }

  # Use a real queuing backend for Active Job (and separate queues per environment).
  config.active_job.queue_adapter = :sidekiq
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@ -4,7 +4,7 @@ settings = {
  debug_mode: true,
  timeout: 5,
  units: :km,
-  cache: Redis.new(url: "#{ENV['REDIS_URL']}/#{ENV.fetch('RAILS_CACHE_DB', 0)}"),
+  cache: Redis.new(url: ENV['REDIS_URL'], db: ENV.fetch('RAILS_CACHE_DB', 0)),
  always_raise: :all,
  http_headers: {
    'User-Agent' => "Dawarich #{APP_VERSION} (https://dawarich.app)"
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 Sidekiq.configure_server do |config|
-  config.redis = { url: "#{ENV['REDIS_URL']}/#{ENV.fetch('RAILS_JOB_QUEUE_DB', 1)}" }
+  config.redis = { url: ENV['REDIS_URL'], db: ENV.fetch('RAILS_JOB_QUEUE_DB', 1) }
  config.logger = Sidekiq::Logger.new($stdout)

  if ENV['PROMETHEUS_EXPORTER_ENABLED'].to_s == 'true'
@ -24,7 +24,7 @@ Sidekiq.configure_server do |config|
 end

 Sidekiq.configure_client do |config|
-  config.redis = { url: "#{ENV['REDIS_URL']}/#{ENV.fetch('RAILS_JOB_QUEUE_DB', 1)}" }
+  config.redis = { url: ENV['REDIS_URL'], db: ENV.fetch('RAILS_JOB_QUEUE_DB', 1) }
 end

 Sidekiq::Queue['reverse_geocoding'].limit = 1 if Sidekiq.server? && DawarichSettings.photon_uses_komoot_io?
--- a/docker/docker-compose.production.yml
+++ b/docker/docker-compose.production.yml
@ -8,7 +8,7 @@ services:
    networks:
      - dawarich
    volumes:
-      - dawarich_redis_data:/var/shared/redis
+      - dawarich_redis_data:/data
    restart: always
    healthcheck:
      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
Author	SHA1	Message	Date
Diogo Correia	35b2455fae	Merge `35f4c0f1f6` into `54aaf03453`	2025-07-16 07:13:05 +02:00
Eugene Burmakin	54aaf03453	Merge branch 'master' into dev	2025-07-14 21:30:51 +02:00
Eugene Burmakin	49d1e7014b	Add simple analytics	2025-07-14 21:26:19 +02:00
Diogo Correia	35f4c0f1f6	fix: use db parameter when constructing redis client Fixes #1507	2025-07-09 19:39:08 +01:00
Evgenii Burmakin	b25647879f	Merge pull request #1484 from Freika/dev 0.29.1	2025-07-02 21:54:51 +02:00
Evgenii Burmakin	e53f509abe	Merge pull request #1428 from tetebueno/patch-4 Using Redis default directory for data	2025-07-02 21:16:17 +02:00
tetebueno	421a20ba8c	Using Redis default directory for data. For some reason for original Docker compose configuration path `/data` was correct, but for production this directory is used which isn't used by Redis, except if it's configured expressly. Checked here: https://github.com/redis/docker-library-redis/blob/master/7.4/alpine/Dockerfile#L134	2025-06-16 12:58:39 -03:00