diff --git a/.yamllint.yaml b/.yamllint.yaml deleted file mode 100644 index d932357..0000000 --- a/.yamllint.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- - -extends: relaxed - -rules: - # 80 chars should be enough, but don't fail if a line is longer - line-length: - max: 200 - level: warning - empty-lines: - max: 2 - max-start: 1 - max-end: 1 - colons: - max-spaces-after: -1 - commas: - max-spaces-after: -1 diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index 29f7744..865de63 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -15,8 +15,6 @@ group: "{{ item.group | default('root') }}" with_items: - { src: "apt.conf.j2", dest: "/etc/apt/apt.conf" } - - { src: "apt-defaultrelease.j2", dest: "/etc/apt/apt.conf.d/09defaultrelease" } - - { src: "apt-preferences-stable.j2", dest: "/etc/apt/preferences.d/stableonly" } - { src: "sources.list.j2", dest: "/etc/apt/sources.list" } - { src: "apt-auto-upgrades.j2", dest: "/etc/apt/apt.conf.d/20auto-upgrades" } - { src: "apt-unattended-upgrades.j2", dest: "/etc/apt/apt.conf.d/50unattended-upgrades" } diff --git a/roles/common/templates/apt-defaultrelease.j2 b/roles/common/templates/apt-defaultrelease.j2 deleted file mode 100644 index 1bab7c5..0000000 --- a/roles/common/templates/apt-defaultrelease.j2 +++ /dev/null @@ -1 +0,0 @@ -APT::Default-Release "{{ ansible_distribution_release }}"; diff --git a/roles/common/templates/apt-preferences-stable.j2 b/roles/common/templates/apt-preferences-stable.j2 deleted file mode 100644 index 8fc3cd0..0000000 --- a/roles/common/templates/apt-preferences-stable.j2 +++ /dev/null @@ -1,19 +0,0 @@ -# Prefer packages from our release -# Prevent auto-installation from testing/unstable/sid/whatever - -Package: * -Pin: release n={{ ansible_distribution_release }} -Pin-Priority: 900 - -Package: * -Pin: release n=sid -Pin-Priority: -10 - -Package: * -Pin: release n=testing -Pin-Priority: -10 - -Package: * -Pin: release n=unstable -Pin-Priority: -10 - diff --git a/roles/common/templates/sources.list.j2 b/roles/common/templates/sources.list.j2 index 2722b8f..3945e1d 100644 --- a/roles/common/templates/sources.list.j2 +++ b/roles/common/templates/sources.list.j2 @@ -20,8 +20,5 @@ deb {{ debian_repourl }} {{ ansible_distribution_release }}-backports {{ compone # # Security patches deb {{ debian_securityurl }} {{ ansible_distribution_release }}-security {{ components }} -{{ SRC }}deb-src {{ debian_securityurl }} {{ ansible_distribution_release }}-security {{ components }} +{{ SRC }}deb-src {{ debian_securityurl }} {{ ansible_distribution_release }}-security main contrib non- free -# Testing/Unstable repos -deb {{ debian_repourl }} testing {{ components }} -deb {{ debian_repourl }} sid {{ components }} diff --git a/roles/nginx/templates/site.conf.j2 b/roles/nginx/templates/site.conf.j2 index 786f7da..d48f46f 100644 --- a/roles/nginx/templates/site.conf.j2 +++ b/roles/nginx/templates/site.conf.j2 @@ -10,7 +10,6 @@ server { ssl_certificate /var/lib/dehydrated/certs/{{ site.server_name }}/fullchain.pem; ssl_certificate_key /var/lib/dehydrated/certs/{{ site.server_name }}/privkey.pem; - index {{ nginx_index | default('index.php index.html index.htm') }}; client_max_body_size {{ nginx_client_max_body_size }}; location ~ /\.ht { diff --git a/roles/photos/tasks/photos2mqtt.yaml b/roles/photos/tasks/photos2mqtt.yaml index d9f2e05..755a4ec 100644 --- a/roles/photos/tasks/photos2mqtt.yaml +++ b/roles/photos/tasks/photos2mqtt.yaml @@ -6,9 +6,8 @@ - liblinux-inotify2-perl - name: Install mqtt-simple - ansible.builtin.apt: - pkg: libnet-mqtt-simple-perl - default_release: testing + ansible.builtin.command: + cmd: cpan Net::MQTT::Simple - name: Install photos2mqtt ansible.builtin.template: diff --git a/roles/services/tasks/power_mqtt.yaml b/roles/services/tasks/power_mqtt.yaml index 1042844..406a274 100644 --- a/roles/services/tasks/power_mqtt.yaml +++ b/roles/services/tasks/power_mqtt.yaml @@ -27,7 +27,7 @@ vars: description: "SMD630 to MQTT Probe" exec: "/var/lib/power-mqtt.py %i" - notify: Restart power-mqtt + notify: Restart power-mqtt@ - name: Enable power-mqtt ansible.builtin.systemd: @@ -40,4 +40,3 @@ ip: 0.0.0.0 - net: unicorndept ip: 0.0.0.0 - ignore_errors: true # FIXME diff --git a/roles/services/tasks/spacestated.yaml b/roles/services/tasks/spacestated.yaml index 92a0ace..3cff5bb 100644 --- a/roles/services/tasks/spacestated.yaml +++ b/roles/services/tasks/spacestated.yaml @@ -8,9 +8,8 @@ - make - name: Install mqtt-simple - ansible.builtin.apt: - pkg: libnet-mqtt-simple-perl - default_release: testing + ansible.builtin.command: + cmd: cpan Net::MQTT::Simple - name: Add user ansible.builtin.user: diff --git a/roles/www/tasks/mqtt.yaml b/roles/www/tasks/mqtt.yaml index 63d1dee..f96fadd 100644 --- a/roles/www/tasks/mqtt.yaml +++ b/roles/www/tasks/mqtt.yaml @@ -8,9 +8,8 @@ - mosquitto - name: Install mqtt-simple - ansible.builtin.apt: - pkg: libnet-mqtt-simple-perl - default_release: testing + community.general.cpanm: + name: Net::MQTT::Simple - name: Clone mqtt2web source ansible.builtin.git: