.gitignore

@@ -60,4 +60,3 @@ tags
 # End of https://www.toptal.com/developers/gitignore/api/vim,linux,vagrant,ansible
 
 development.yml
-single-test.yml

roles/gitea/handlers/main.yml

@@ -3,8 +3,7 @@
     container: "{{ gitea_app_container_name['stdout'] }}"
     command: >
       gitea admin user create --admin --username {{ gitea_app_admin_username }} --password {{ gitea_app_admin_password }} --email {{ gitea_app_admin_email }}
-    user: git
+  become: yes
-  become: true
   listen: "no admin user"
   
 ## Register reverse proxy

roles/gitea/tasks/main.yml

@@ -91,21 +91,14 @@
   become: yes
   tags:
     - docker-swarm
-  register: gitea_deployment
   notify: "update gitea upstream"
 
-- name: Wait 30 seconds for gitea to become healthy
-  wait_for:
-    timeout: 60
-  delegate_to: localhost
-  when: gitea_deployment is changed
-
 - name: Get app container info
   ansible.builtin.command:
     cmd: docker ps -q -f name={{ stack_name }}_app
   become: yes
   until: gitea_app_container_name['rc'] == 0 and gitea_app_container_name['stdout'] | length >= 1
-  retries: 10
+  retries: 5
   delay: 10
   changed_when: False
   register: gitea_app_container_name
@@ -116,10 +109,11 @@
     user: git
     command: >
       gitea admin user list --admin
-  until: gitea_admin_list is defined and gitea_admin_list['rc'] == 0
+  become: yes
-  retries: 15
+  until: "'connection refused' not in gitea_admin_list['stdout'] and 'Failed to run app' not in gitea_admin_list['stdout']"
+  retries: 10
   delay: 10
-  become: true
-  register: gitea_admin_list
   changed_when: gitea_admin_list['stdout_lines'] | length <= 1 and 'Username' in gitea_admin_list['stdout'] 
+  failed_when: (gitea_admin_list['rc'] == 1 and gitea_admin_list['attempts'] >= 5) or 'Gitea is not supposed to be run as root' in gitea_admin_list['stdout']
+  register: gitea_admin_list
   notify: "no admin user"

roles/ntfy/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
+
 ntfy_version: latest
 
 ntfy_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}"
@@ -7,9 +8,9 @@ ntfy_use_https: true
 
 subdomain_alias: push
 
-ntfy_global_topic_limit: 15000
+ntfy_global_topic_limit: "15000" 
-ntfy_visitor_subscription_limit: 30
+ntfy_visitor_subscription_limit: "30"
-ntfy_visitor_request_limit_burst: 60
+ntfy_visitor_request_limit_burst: "60"
 ntfy_visitor_request_limit_replenish: "10s"
 ntfy_cache_duration: "12h"
 ntfy_attachment_total_size_limit: "5G"

roles/ntfy/templates/docker-stack.yml.j2

@@ -14,8 +14,6 @@ services:
       - cache:/var/cache/ntfy
     networks:
       - "{{ docker_swarm_public_network_name }}"
-    command:
-      - serve
 
 volumes:
   cache:

roles/ntfy/templates/server.yml.j2

@@ -1,7 +1,7 @@
 base-url: "https://{{ server_domain }}"
-global_topic_limit: {{ ntfy_global_topic_limit }}
+global_topic_limit: "{{ ntfy_global_topic_limit }}"
-visitor_subscription_limit: {{ ntfy_visitor_subscription_limit }}
+visitor_subscription_limit: "{{ ntfy_visitor_subscription_limit }}"
-visitor_request_limit_burst: {{ ntfy_visitor_request_limit_burst }}
+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 }}"

site.yml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: all
   tasks:
     - name: Make sure system is fully upgraded
@@ -23,6 +24,11 @@
         role: caddy
       tags: caddy
 
+    - name: Install whoami
+      import_role: 
+        role: whoami
+      tags: whoami
+
     - name: Install wallabag
       import_role: 
         role: wallabag