playbooks/link.yml

@@ -4,29 +4,9 @@
     - cdr_link
   roles:
     - role: sr2c.core.baseline
-      vars:
-        baseline_epel_packages_allowed:
-          - node-exporter
       tags: bootstrap
     - role: sr2c.apps.podman_link
       tags: link
-    - role: sr2c.core.node_exporter
-      tags: prometheus
-
-- name: Podman CDR Link | Update instance list for Prometheus
-  hosts:
-    - prometheus
-  tags:
-    - prometheus
-  tasks:
-    - name: Podman CDR Link | Update instance list for Prometheus
-      ansible.builtin.template:
-        src: link_sd.yml
-        dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/link.yml"
-        owner: "{{ podman_prometheus_podman_rootless_user }}"
-        group: "{{ podman_prometheus_podman_rootless_user }}"
-        mode: "0444"
-      become: true
 
 - name: Legacy Link | Set up ClouDNS monitoring of legacy (Docker Compose) Link instances
   hosts:

playbooks/seafile.yml

@@ -4,26 +4,6 @@
     - seafile
   roles:
     - role: sr2c.core.baseline
-      vars:
-        baseline_epel_packages_allowed:
-          - node-exporter
       tags: bootstrap
     - role: sr2c.apps.podman_seafile
       tags: seafile
-    - role: sr2c.core.node_exporter
-      tags: prometheus
-
-- name: Podman Seafile | Update instance list for Seafile
-  hosts:
-    - prometheus
-  tags:
-    - prometheus
-  tasks:
-    - name: Podman Seafile | Update instance list for Seafile
-      ansible.builtin.template:
-        src: seafile_sd.yml
-        dest: "/home/{{ podman_prometheus_podman_rootless_user }}/file-configs/seafile.yml"
-        owner: "{{ podman_prometheus_podman_rootless_user }}"
-        group: "{{ podman_prometheus_podman_rootless_user }}"
-        mode: "0444"
-      become: true

playbooks/templates/link_sd.yml

@@ -1,8 +0,0 @@
----
-- targets:
-{% for host in groups['cdr_link'] %}
-    - "{{ host }}:9100"
-{% endfor %}
-  labels:
-    job: node
-    app: link

playbooks/templates/seafile_sd.yml

@@ -1,8 +0,0 @@
----
-- targets:
-{% for host in groups['seafile'] %}
-    - "{{ host }}:9100"
-{% endfor %}
-  labels:
-    job: node
-    app: seafile

roles/podman_link/tasks/main.yml

@@ -148,7 +148,6 @@
     line: "local\tall\tall\tscram-sha-256"
     state: present
     create: false
-  failed_when: false  # TODO: only run when file already exists (#13)
   become: true
   with_items:
     - postgresql
@@ -164,7 +163,6 @@
     line: "local\treplication\tall\tscram-sha-256"
     state: present
     create: false
-  failed_when: false  # TODO: only run when file already exists (#13)
   become: true
   with_items:
     - postgresql

roles/podman_link/templates/home/config/containers/systemd/zammad-railsserver.container

@@ -1,7 +1,7 @@
 [Unit]
 Requires=zammad-storage.target
 After=zammad-storage.target
-Wants=zammad-init.service zammad-scheduler.service zammad-reindex.service
+Wants=zammad-init.service zammad-reindex.service
 PartOf=zammad-nginx.service
 
 [Container]

roles/podman_seafile/tasks/main.yml

@@ -120,14 +120,3 @@
   become: true
   notify:
     - Restart Seafile
-
-- name: Podman Seafile | Set up ClouDNS monitoring
-  sr2c.core.cloudns_monitor:
-    name: "Seafile - {{ inventory_hostname[:22] }}"
-    host: "{{ inventory_hostname }}"
-    ip: "{{ inventory_hostname }}"
-    http_status_code: "200"
-    emails: "{{ cloudns_monitoring_emails }}"
-    auth_id: "{{ cloudns_auth_id }}"
-    auth_password: "{{ cloudns_auth_password }}"
-  delegate_to: localhost