From 926f1f475fdd996f9ee6827a81729ae85e53ff69 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Sun, 18 Dec 2022 15:47:14 +0100
Subject: [PATCH] Fix ntfy settings

Fixed numeric settings for ntfy and a corrected command executed.
---
 roles/ntfy/defaults/main.yml             | 7 +++----
 roles/ntfy/templates/docker-stack.yml.j2 | 2 ++
 roles/ntfy/templates/server.yml.j2       | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/ntfy/defaults/main.yml b/roles/ntfy/defaults/main.yml
index 14089c2..70e3275 100644
--- a/roles/ntfy/defaults/main.yml
+++ b/roles/ntfy/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
-
 ntfy_version: latest
 
 ntfy_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}"
@@ -8,9 +7,9 @@ ntfy_use_https: true
 
 subdomain_alias: push
 
-ntfy_global_topic_limit: "15000" 
-ntfy_visitor_subscription_limit: "30"
-ntfy_visitor_request_limit_burst: "60"
+ntfy_global_topic_limit: 15000
+ntfy_visitor_subscription_limit: 30
+ntfy_visitor_request_limit_burst: 60
 ntfy_visitor_request_limit_replenish: "10s"
 ntfy_cache_duration: "12h"
 ntfy_attachment_total_size_limit: "5G"
diff --git a/roles/ntfy/templates/docker-stack.yml.j2 b/roles/ntfy/templates/docker-stack.yml.j2
index bf0e5a5..ffa1dc9 100644
--- a/roles/ntfy/templates/docker-stack.yml.j2
+++ b/roles/ntfy/templates/docker-stack.yml.j2
@@ -14,6 +14,8 @@ services:
       - cache:/var/cache/ntfy
     networks:
       - "{{ docker_swarm_public_network_name }}"
+    command:
+      - serve
 
 volumes:
   cache:
diff --git a/roles/ntfy/templates/server.yml.j2 b/roles/ntfy/templates/server.yml.j2
index cbbe8a5..93c8bb8 100644
--- a/roles/ntfy/templates/server.yml.j2
+++ b/roles/ntfy/templates/server.yml.j2
@@ -1,7 +1,7 @@
 base-url: "https://{{ server_domain }}"
-global_topic_limit: "{{ ntfy_global_topic_limit }}"
-visitor_subscription_limit: "{{ ntfy_visitor_subscription_limit }}"
-visitor_request_limit_burst: "{{ ntfy_visitor_request_limit_burst }}"
+global_topic_limit: {{ ntfy_global_topic_limit }}
+visitor_subscription_limit: {{ ntfy_visitor_subscription_limit }}
+visitor_request_limit_burst: {{ ntfy_visitor_request_limit_burst }}
 visitor_request_limit_replenish: "{{ ntfy_visitor_request_limit_replenish }}"
 cache-file: "/var/cache/ntfy/cache.db"
 cache_duration: "{{ ntfy_cache_duration }}"