Merge 543242cdf3 into 54aaf03453

Merge branch 'master' into dev
Add simple analytics
2026-01-11 09:41:40 -05:00 · 2025-07-17 00:53:22 +01:00 · 2025-07-14 21:30:51 +02:00 · 2025-07-14 21:26:19 +02:00 · 2025-07-02 21:54:51 +02:00 · 2025-07-02 21:16:17 +02:00
2 changed files with 4 additions and 1 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/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
Aljoscha Grebe	3ad788331c	Merge `543242cdf3` into `54aaf03453`	2025-07-17 00:53:22 +01: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
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