Linter + Dashboard fixes

This commit is contained in:
Mark Janssen 2024-07-31 20:33:54 +02:00
parent e1bf3e1765
commit abc64144a8
Signed by: foobar
GPG key ID: D8674D8FC4F69BD2
44 changed files with 265 additions and 379 deletions

View file

@ -1,14 +1,15 @@
---
- ansible.builtin.import_tasks:
- name: Import handlers
ansible.builtin.import_tasks:
file: ../../common/handlers/main.yaml
- name: restart spaceapi
- name: Restart spaceapi
ansible.builtin.systemd:
name: spaceapi
state: restarted
daemon_reload: true
- name: restart mqtt2web
- name: Restart mqtt2web
ansible.builtin.systemd:
name: mqtt2web
state: restarted

View file

@ -1,16 +1,25 @@
---
- tags: www_calendar
- name: Import calendar
ansible.builtin.import_tasks:
file: calendar.yaml
tags:
- www_calendar
- tags: www_mediawiki
- name: Import mediawiki
ansible.builtin.import_tasks:
file: mediawiki.yaml
tags:
- www_mediawiki
- tags: www_mqtt
- name: Import mqtt
ansible.builtin.import_tasks:
file: mqtt.yaml
tags:
- www_mqtt
- tags: www_spaceapi
- name: Import spaceapi
ansible.builtin.import_tasks:
file: spaceapi.yaml
tags:
- www_spaceapi

View file

@ -1,4 +1,5 @@
---
- name: Install dependencies
ansible.builtin.apt:
name: php-fpm
@ -12,19 +13,3 @@
group: root
mode: 0644
- name: Allow HTTP/HTTPS
ansible.builtin.iptables:
chain: INPUT
protocol: tcp
destination_port: "{{ item.port }}"
ctstate: NEW
jump: ACCEPT
ip_version: "{{ item.ip }}"
action: insert
with_items:
- { ip: ipv4, port: 80 }
- { ip: ipv4, port: 443 }
- { ip: ipv6, port: 80 }
- { ip: ipv6, port: 443 }
notify: persist iptables
when: not nft | bool

View file

@ -1,4 +1,5 @@
---
- name: Install dependencies
ansible.builtin.apt:
name:
@ -6,32 +7,17 @@
- liblinux-epoll-perl
- mosquitto
- name: Allow MQTT
ansible.builtin.iptables:
chain: INPUT
protocol: tcp
destination_port: "{{ item.port }}"
ctstate: NEW
jump: ACCEPT
ip_version: "{{ item.ip }}"
action: insert
with_items:
- { ip: ipv4, port: 1883 }
- { ip: ipv6, port: 1883 }
notify: persist iptables
when: not nft | bool
- name: Install mqtt-simple
ansible.builtin.command:
cmd: cpan Net::MQTT::Simple
community.general.cpanm:
name: Net::MQTT::Simple
- name: Clone mqtt2web source
ansible.builtin.git:
repo: https://github.com/bitlair/mqtt2web.git
version: master
dest: /opt/mqtt2web
accept_hostkey: yes
notify: restart mqtt2web
accept_hostkey: true
notify: Restart mqtt2web
- name: Install mqtt2web service file
ansible.builtin.template:
@ -41,10 +27,11 @@
group: root
mode: 0644
notify:
- daemon reload
- restart mqtt2web
- Daemon reload
- Restart mqtt2web
- ansible.builtin.meta: flush_handlers
- name: Flush handlers
ansible.builtin.meta: flush_handlers
- name: Enable mqtt2web
ansible.builtin.systemd:

View file

@ -4,8 +4,8 @@
repo: https://github.com/bitlair/spaceapi.git
version: main
dest: /opt/spaceapi
accept_hostkey: yes
notify: restart spaceapi
accept_hostkey: true
notify: Restart spaceapi
- name: Install spaceapi service file
ansible.builtin.template:
@ -13,8 +13,8 @@
dest: /etc/systemd/system/spaceapi.service
owner: root
group: root
mode: 0644
notify: restart spaceapi
mode: "0644"
notify: Restart spaceapi
- name: Enable spaceapi
ansible.builtin.systemd: